Commit Graph

11547 Commits

Author SHA1 Message Date
Benau
0393eef825 Merge remote-tracking branch 'origin/win_lose_music' 2016-01-03 10:27:37 +08:00
Benau
d4e312885a Make SFX depends on race result too
Currently use gp_end for test
2016-01-03 10:19:51 +08:00
Marianne Gagnon
b1ef0bc40a Try to fix travis build 2016-01-02 20:57:46 -05:00
Marianne Gagnon
15b35b76ac Scripting : add ability to use delegates for timeouts (enabling complex timeouts) 2016-01-02 20:34:39 -05:00
Benau
37da8423f8 Fix #2417 2016-01-03 09:04:24 +08:00
Benau
2aaab61f93 Implement win or lose music for race result screen
TODO: Proper music file
2016-01-01 13:31:15 +08:00
Benau
9624b1ab28 Prevent crashes when invaild navmesh is used or no items in an arena 2015-12-31 09:34:37 +08:00
Benau
629f090646 More battle mode improvements
1. Fix text overflow in arena menu

2. Try to make battle AI avoiding eating banana
2015-12-29 08:27:24 +08:00
Benau
94c5ba4193 Add more arena info in track screen 2015-12-24 07:53:49 +08:00
Deve
70aad3e265 Just rename a variable 2015-12-20 13:46:41 +01:00
Deve
f9c48a0fa2 Fixed compute shaders compilation for drivers which report only OpenGL 3.x 2015-12-20 13:46:41 +01:00
Deve
9eb6694d61 Check for arrays of arrays extension, which we use in compute shaders 2015-12-20 13:46:41 +01:00
Benau
4e5197e7c1 Different max number of AIs per arena
Now I make large arena like stadium to have max 8 player-slots,
should be very fun to play

Remember update stk-assets to test!
2015-12-20 16:28:01 +08:00
Benau
fefeffad91 Further clean 2015-12-20 09:01:50 +08:00
Benau
3d409a9742 Fix comment 2015-12-20 01:13:51 +08:00
Benau
08b2e27ed9 More clean up 2015-12-19 16:23:18 +08:00
Benau
e4da6d4a99 Merge remote-tracking branch 'origin/master' into graph_cleanup 2015-12-19 16:23:11 +08:00
Benau
74c547cb1d Remove duplicated code, plus some more cleanup 2015-12-19 02:09:37 +08:00
Marianne Gagnon
94151dda60 Add forgotten file 2015-12-17 20:25:05 -05:00
hiker
c222ba2ebd Added documentation and minor cosmetic changes. 2015-12-16 18:31:03 +11:00
hiker
c9bf95079c Cosmetic changes only. 2015-12-16 08:22:30 +11:00
hiker
6280613e5c Avoid incorrect warning message in case of a disconnect. 2015-12-16 07:59:10 +11:00
hiker
07baf05b90 Fixed incorrect order in which protol ids were deleted. 2015-12-16 07:58:39 +11:00
hiker
68e37c902f Merge remote-tracking branch 'origin/master' into refactor_networking 2015-12-15 22:52:55 +11:00
hiker
430529ed58 Fixed non-windows compilation. 2015-12-15 09:14:51 +11:00
hiker
5c2f78b176 Refactored Local- and NetworkPlayerController to use a common base
class PlayerController.
2015-12-15 07:50:50 +11:00
Benau
12e4c76a6f Add minimap for battle mode when it has a navigation mesh
TODO: update battle island arena to use only 4 vertices per poly
2015-12-15 02:32:01 +08:00
Deve
e6068923b4 Give more light in kart selection screen 2015-12-14 19:23:27 +01:00
Deve
153fabb502 Fixed a crash on start with legacy pipeline 2015-12-14 19:03:10 +01:00
Deve
bddfa43da4 One more tweak.
glGetFramebufferAttachmentParameteriv function is available in OpenGL 3.0 and newer.
2015-12-14 18:56:08 +01:00
deve
5f46863a19 Display pop-up message when fatal error occured on windows.
The reason to do it is that in release mode we don't receive any message in console. This causes that the game sometimes doesn't start and you have no idea why (for example missing supertuxkart.git file etc.).
2015-12-14 12:25:04 +01:00
deve
4531b15d5c Check for sRGB workaround only if needed.
This fixes the crash for old OpenGL 2.1 drivers
2015-12-14 11:35:42 +01:00
Benau
9d1c9fac5a Merge remote-tracking branch 'origin/master' into i18n 2015-12-14 03:00:07 +08:00
Benau
7fccddb734 Show "Fribidized" user name and enable input for it 2015-12-14 02:56:42 +08:00
Benau
f0abbad937 Fix plural forms 2015-12-14 02:56:16 +08:00
Deve
306ace7fd2 Keep consistency with log label in irr driver 2015-12-11 19:18:14 +01:00
Deve
7dd7f76e87 Check if we really need to re-create the device by checking if framebuffer is sRGB or not. 2015-12-11 19:18:14 +01:00
Deve
80d36208f1 Added ugly hack, which forces srgb-capable framebuffer creation for intel drivers on linux 2015-12-11 19:18:14 +01:00
Deve
0216fd9697 Request sRGB-capable visual during creating OpenGL context.
We need it for proper working. When it's not available, then function glEnable(GL_FRAMEBUFFER_SRGB) doesn't take any effect, and then displayed image is too dark.

It doesn't solve the issue that the screen is too dark for intel graphics cards on linux, because the driver ignores this request. But still, this is the proper way to do it and it may avoid similar issues in future.

Actually we should detect that the visual is not srgb-capable, and in this case maybe make some gamma correction or filter it on our side to get similar effect.
2015-12-11 19:18:14 +01:00
Benau
93b1b11b99 Merge remote-tracking branch 'origin/master' into i18n 2015-12-11 09:27:15 +08:00
Benau
8f6a529531 Complete fix to arena selection menu (handle random arenas) 2015-12-10 15:49:47 +08:00
hiker
dbd210d08c Renamed PlayerController into LocalPlayerController. 2015-12-10 17:54:29 +11:00
hiker
770d05f0de Fixed crash if more than one kart is connected to the server (since the
network kart screen will only show local karts now).
2015-12-10 17:37:28 +11:00
hiker
e0b3de17f6 Added new isLocalPlayerKart() function to controller, which is used
to detect when sfx and graphical effects should be shown. The isPlayerKart
funtion is used to detect a (local or remote) player, e.g. for rubber-banding
the AI, or finding the Xth player kart.
2015-12-10 17:35:31 +11:00
Benau
cebefcf374 Fix some gui interface bugs:
1. Fix credits fading effect

2. Display have many no of (addons mostly) arenas are hidden due to
   missing of navigation mesh

3. Fix wrong size of kart stats bar
2015-12-10 10:25:52 +08:00
Benau
ca6da8c537 Make AI smarter
1. Correct fire angle for bowling

2. When swapper is used, follow a closest kart instead.
2015-12-10 01:21:01 +08:00
Benau
11c4b41f13 More menu fix 2015-12-09 12:42:13 +08:00
hiker
1969ee0b1f Set a name for each thread in VS. 2015-12-09 08:55:46 +11:00
Benau
aac5a368b8 Avoid invaild Ai karts number during switching game modes 2015-12-09 01:27:02 +08:00
hiker
1755f22663 Cosmetic changes only. 2015-12-09 00:13:35 +11:00
Benau
140a229f71 Fix swatter issue 2015-12-08 16:47:42 +08:00
hiker
03594fcad9 Bugfix: the server would try to send a received kart action to the
server again.
2015-12-08 17:28:01 +11:00
hiker
34dad96017 Minor code cleanup. 2015-12-08 17:25:19 +11:00
hiker
786f9eb693 Fixed typoe (isclient vs isClient). 2015-12-08 17:24:10 +11:00
Benau
c789b1a8df Fix compile error 2015-12-08 10:46:01 +08:00
Benau
2644b0458b Merge remote-tracking branch 'origin/master' into battleAI 2015-12-08 10:09:35 +08:00
auriamg
f0fafc2651 Merge pull request #2245 from Flakebi/kart-properties
Kart properties
2015-12-07 18:44:14 -05:00
hiker
7fa062881d Removed unused variable. 2015-12-08 08:08:00 +11:00
Benau
152dddc110 Fix potential hang after end race in temple arena 2015-12-08 00:44:28 +08:00
hiker
e74ef461a4 Fixed crash (probably in debug mode only): iterator+i+o would
first compute and check iterator+i, and not iterator+(i+o), which
caused a crash.
2015-12-07 23:54:43 +11:00
hiker
27f1828c73 Fix crash (in case of result==false, index could be out of bounce). 2015-12-07 23:51:38 +11:00
hiker
7cc77f41f7 File missing in previous commit. 2015-12-07 23:50:21 +11:00
Benau
21c38a6c0b Make swatter disappear after one hit in 3 strikes battle 2015-12-07 16:24:11 +08:00
hiker
d8b417d536 Cosmetic changes; removed static variable. 2015-12-07 17:05:08 +11:00
Marianne Gagnon
ae916fced6 Add warning when animated texture not found 2015-12-06 20:14:55 -05:00
Benau
ba706f4476 Make swatter works better 2015-12-07 02:27:21 +08:00
Benau
b92395533e Fix infinite loop 2015-12-06 14:43:07 +08:00
Benau
239412327a Fix crashes when a kart has no wheels 2015-12-06 13:51:38 +08:00
Marianne Gagnon
cfc6ccf5ea Add missing copyright 2015-12-05 21:47:50 -05:00
Marianne Gagnon
27290b4ffb More work on scripting Property animator 2015-12-05 20:45:37 -05:00
Marianne Gagnon
840bc3df64 Make more properties animatable + fix build (oops, forgot files in previous commit) 2015-12-05 20:03:11 -05:00
Marianne Gagnon
2252495fdc Scripting refactor : add new property animator helper, transfer light animations to this new animator class. Can be used in the future to animate more properties 2015-12-05 19:42:06 -05:00
Benau
8a0cbea933 Merge remote-tracking branch 'origin/master' into battleAI 2015-12-05 16:27:06 +08:00
Benau
ed41b7c805 Proper fix for reverse and unstuck 2015-12-05 16:21:12 +08:00
Flakebi
f63c4af8be
Fix crash 2015-12-04 21:19:15 +01:00
Benau
9ad438b945 Try to fix too fast reverse and unstuck issue 2015-12-04 16:32:33 +08:00
hiker
9153439f68 Cosmetic changes only. 2015-12-04 18:07:43 +11:00
hiker
35d1059a39 Cosmetic changes only (coding style, comments). 2015-12-04 17:52:21 +11:00
hiker
97756dd337 Only show kart selection widgets for local (and this means atm only
one) player.
2015-12-04 08:12:29 +11:00
hiker
637202077f Automatically start game when all track votes have been received. 2015-12-04 08:00:51 +11:00
Deve
8980a32c20 Added profiler marker to keep consistency with other effects 2015-12-03 19:31:13 +01:00
Deve
9b3908cc62 Some lightning improvements:
- move OpenGL-related code to graphics directory, as it should be
- solve issue with applying effect multiple times in multiplayer mode
- remove old already disabled opengl code
2015-12-03 19:25:40 +01:00
deve
94d5c19b7f Fixed compiler warnings.
The winsock2.h header should be always included before windows.h header (or we should define WIN32_LEAN_AND_MEAN). It's because windows.h header includes also winsock.h header and there is possible conflict between winsock and winsock2.

I didn't test in on Visual Studio yet. I hope there is no WIN32_LEAN_AND_MEAN redefinition errors...
2015-12-03 14:59:54 +01:00
deve
0bd15acb93 Fixed compiler warning.
gcc complains that std::auto_ptr is deprecated.
2015-12-03 14:51:26 +01:00
deve
dbdf9db377 Fixed cygwin compilation.
Unfortunately it doesn't support std::to_string function, even on relatively new gcc (tested with version 4.9.2).
2015-12-03 14:38:57 +01:00
Benau
ab428dc8cf Different AI intelligence per difficulties 2015-12-03 16:13:39 +08:00
hiker
af3f72ae84 Automatically trigger computing the track data (based on votes)
once the game starts.
2015-12-03 17:56:16 +11:00
hiker
26155933f0 Set the local master on the server. 2015-12-03 17:54:24 +11:00
Flakebi
c5277edc54
Change suspension-travel that was changed in master meanwhile 2015-12-03 02:15:58 +01:00
hiker
0983038d5c Fixed size of token. 2015-12-03 09:10:07 +11:00
hiker
9765c56a44 Enable voting for tracks. 2015-12-03 08:24:17 +11:00
hiker
4286f47a31 Fixed incorrect indices. 2015-12-03 08:23:52 +11:00
hiker
ee7097af35 Added some default settings for race mode and send them to the server.
Changed major and minor mode in protocols from 1-byte to int, since 1-byte
is too small to store the actual values.
2015-12-03 07:53:56 +11:00
Flakebi
dbecbc3840
Assign KartProperties to a variable instead of fetching it every time 2015-12-02 19:40:28 +01:00
Benau
b5d4610f45 Better navmesh handling 2015-12-02 10:41:32 +08:00
Benau
084a4ee844 Fix crashes when no navmesh
User should have no way to start with ai in battle mode,
when the arena has no navmesh.

Unless artist debug mode or more than 1 human players.
2015-12-02 10:08:03 +08:00
hiker
03d857db3e Removed unnecessary code. 2015-12-02 08:17:03 +11:00
hiker
0f52f0bdd9 Fixed incorrect message id in kart selection update message. 2015-12-02 08:16:22 +11:00
hiker
dfa78eaef2 Fixed random token computation to use indeed all 32 bits. 2015-12-02 07:45:05 +11:00
hiker
6d272d8a5a Fixed crash when quicly exiting stk after refreshing the server list. 2015-12-01 23:25:04 +11:00