ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,866 Commits 9 Branches 28 Tags 433 MiB
403d61e754
Commit Graph

937 Commits

Author SHA1 Message Date
Marianne Gagnon
b204de7a8e Ignore billboard text nodes in physics, fixes #1666 2014-11-14 18:26:48 -05:00
Marianne Gagnon
6c85480010 Do not use 0,0,0 as default sun position when unspecified, as this will give unpredictable results when normalized 2014-11-14 18:09:53 -05:00
Marianne Gagnon
6429d394e5 bugfix: auto-calculate tangents for static-mesh too 2014-10-30 19:57:03 -04:00
hiker
f7d767e57b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-28 09:47:28 +11:00
Marianne Gagnon
139f20b39d Merge remote-tracking branch 'sachith/ScriptEngine' 
Conflicts:
	CMakeLists.txt
	sources.cmake
	src/io/file_manager.cpp
	src/io/file_manager.hpp
	src/modes/world.hpp
	src/tracks/track.hpp
	src/tracks/track_object_presentation.cpp
 2014-10-27 18:43:09 -04:00
hiker
b66fb2e56b Removed unnecessary parameter for gamepads in processAndMapInput, 
started a common virtual function for processAndMapInput. Removed
unnecessary #includes, cosmetic changes.
 2014-10-28 09:00:22 +11:00
hiker
ec908d85c6 Split GamepadDevice and KeyboarDevice from input_device into their 
own files. Renamed InputManager::getDeviceList() to getDeviceManager().
 2014-10-25 23:09:00 +11:00
Marianne Gagnon
047c6fc760 Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
Marianne Gagnon
0025f908db Add cleanup post-minimap-RTT. Appears to fix #1470 . Hard to know for sure since this bug is random :( 2014-10-20 20:38:37 -04:00
hiker
a09c1346b7 Fixed sound objects. 2014-10-21 08:21:58 +11:00
Vincent Lejeune
f3dd009376 Try to fix model loader hpp 2014-10-19 18:44:08 +02:00
Marianne Gagnon
9b46cdc981 Refactor library nodes to be proper TrackObjects, allows animating them with curves 2014-10-18 19:11:24 -04:00
hiker
8fcc373b2a Add volume, speed, and position settings to be done by the sfx 
thread. Removed more unnecessary error checks (which mostly flood
stdout with 'not playing ...' messages), and renamed volume, position
and speed to setVolume, setPosition and setSpeed.
 2014-10-15 07:55:18 +11:00
hiker
665f146923 Moved SFXStatus enum to SFXBase. 2014-10-14 08:05:04 +11:00
Marianne Gagnon
2b90cb2a69 Use case-insensitive comparison for animated textures, for some reason 2014-10-12 20:12:40 -04:00
hiker
bfe84612fa Let all SFX commands be handled by the sfx manager thread (otherwise 
events could be handled in the wrong order, e.g. a delete from the
main thread before the play in the manager thread, resulting in a crash).
Should fix #1511 and #1604.
 2014-10-13 08:26:45 +11:00
Vincent Lejeune
b56901bacd Fix minimap halo second time it is rendered. 2014-10-04 01:42:25 +02:00
Marianne Gagnon
22a884828a Use unlit material for minimap, to avoid dark minimap segments 2014-10-02 18:52:17 -04:00
hiker
584e909846 Use a separaet asset class for library object to avoid hardcoding 
the name of library directory (and avoid searching for files in
more than one directory).
 2014-09-30 10:47:10 +10:00
hiker
2cab457cbc Removed unnecessary call to getAsset(). 2014-09-30 09:47:57 +10:00
Marianne Gagnon
c26a2413b2 Properly cleanup mesh cache, fixes crash on second play 2014-09-29 18:42:10 -04:00
Marianne Gagnon
fe569797a3 Partial fix for objects not being cleaned up when they should. There's more left 2014-09-27 20:37:20 -04:00
Marianne Gagnon
4f6bb4565f Revert earlier bugfix attempt, causes other issues 2014-09-27 20:10:47 -04:00
Marianne Gagnon
38b9c059d1 Tentative fix for a crash when playing a track the 2nd time 2014-09-27 19:48:48 -04:00
Marianne Gagnon
ef94c77a67 suppress false positive warning 2014-09-27 19:27:28 -04:00
Marianne Gagnon
6df86551eb Remove unused code 2014-09-23 18:40:07 -04:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
Marianne Gagnon
53f9c5efdc Fix tangent generation in track objects 2014-09-19 20:17:49 -04:00
Vincent Lejeune
ad6728ce51 Apparently fix minimap 2014-09-20 01:31:11 +02:00
hiker
e18c20db65 Fixed various compiler warnings. 2014-09-19 11:02:20 +10:00
hiker
86b351fbf4 Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
Sachith Hasaranga Seneviratne
10e2634f22 Merged master 2014-09-13 08:45:41 +05:30
hiker
bf135095d8 Updated documentation, removed commented out code. 2014-09-12 08:37:03 +10:00
hiker
68e45db8d3 Start to support driving (and rescuing) on physical track objects. 2014-09-11 21:48:03 +10:00
Sachith Hasaranga Seneviratne
71ad22b2d8 Resetting a track now properly accounts for scripting 2014-09-10 19:09:31 +05:30
Sachith Hasaranga Seneviratne
b6a9e5be9c Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-09-10 17:15:01 +05:30
hiker
52a9993ba3 Minor cosmetic changes. 2014-09-08 21:26:49 +10:00
Sachith Hasaranga Seneviratne
118db58a02 Merged Master 2014-09-07 11:28:15 +05:30
hiker
1c23309161 Merge branch 'master' into gui_screen 2014-09-05 09:18:17 +10:00
vlj
13e1a40b7b Remove stkinstancedscenenode.h/cpp 2014-09-03 01:33:52 +02:00
Marianne Gagnon
102e517497 Remove manual LOD code, it's now automatic 2014-09-02 18:54:38 -04:00
hiker
ccdc90f029 Removed while loop with a 'random' abort condition - while it works 
it could result in STK hanging if a broken random generator should be
used.
 2014-09-03 08:08:41 +10:00
Vincent Lejeune
dfbae2ea07 Remove instancing 2014-09-02 20:18:22 +02:00
Deve
7d0dec5c49 Handle lightning and sound in weather property 2014-09-01 20:18:06 +02:00
Marianne Gagnon
a8c5ab43d3 Rename variable + bugfix 2014-08-29 21:09:12 -04:00
Marianne Gagnon
90396678b7 Separate lightshaft from sun 2014-08-29 20:28:19 -04:00
Deve
5a937d6f12 Fixed creating rain class 2014-08-29 21:54:17 +02:00
hiker
c9936ffb97 Forgot to actually add the new files :( 2014-08-25 10:47:36 +10:00
hiker
16b88d13db Fixed compiler warning. 2014-08-23 12:10:12 +10:00
Marianne Gagnon
c8b50c67ef Fix leak 2014-08-20 20:38:05 -04:00
Vincent Lejeune
04f6c7e729 Use singleton template for VAOManager (ex VBOGatherer) 2014-08-20 23:08:04 +02:00
Sachith Hasaranga Seneviratne
e9fc465a32 changed back to working version 2014-08-14 15:57:25 +05:30
Marianne Gagnon
b95765c172 use better tool to calculate tangents 2014-08-13 18:35:07 -04:00
Marianne Gagnon
976ea043bb Add missing bit of code 2014-08-13 18:25:21 -04:00
Sachith Hasaranga Seneviratne
a695c197b2 Merge master 2014-08-13 12:12:51 +05:30
Sachith Hasaranga Seneviratne
b2a563c746 Fixed the ID for script created triggers were not being added to the track_object instance 2014-08-13 11:57:49 +05:30
hiker
7111eb55ee Merge branch 'laps' of https://github.com/konstin/stk-code into konstin-laps 2014-08-13 16:01:22 +10:00
vlj
0f5effc2d9 Use collision shape for RSM size. 2014-08-10 22:05:00 +02:00
Marianne Gagnon
b2e08c94a7 Fix physics of instanced nodes 2014-08-09 21:22:12 -04:00
vlj
496269e73b Make SSAO param changeable. 2014-08-09 18:51:52 +02:00
Vincent Lejeune
c8a9515ad0 Use debug slider to change ambient on the fly. 2014-08-09 01:10:19 +02:00
Sachith Hasaranga Seneviratne
ef17ad8072 Added comments to TrackObjectManager 2014-08-05 20:28:40 +05:30
Sachith Hasaranga Seneviratne
f83a524f61 Prevent Physics from trying to add a body to Physics world when there is none present 2014-08-05 20:13:17 +05:30
Marianne Gagnon
fd1bde9eeb New billboard text scene node is almost complete now 2014-08-03 19:30:59 -04:00
Sachith Hasaranga Seneviratne
8eb5fc0d94 Fixed mesh objects trying to remove physical bodies when there are none and fixed logic for barrel test to remove the animation 2014-08-02 09:15:48 +05:30
Sachith Hasaranga Seneviratne
c3a774fcc9 Merged master 2014-08-01 18:40:05 +05:30
Vincent Lejeune
bd7babe11f Rename cpp2011.h 2014-07-29 00:35:43 +02:00
hiker
d3dbc42174 Fix #1429 (physical objects do not reset when restarting a race). 2014-07-28 16:53:08 +10:00
hiker
425675bdac Moved check_structure detection from center of kart to the front 
of the kart (which will work better for a photo finish). Hopefully
no other side effect.
 2014-07-28 09:52:44 +10:00
konstin
7a2e4e6336 corrections 2014-07-26 12:00:24 +02:00
konstin
5167397441 Merge branch 'master' of https://github.com/supertuxkart/stk-code into laps 2014-07-25 14:18:54 +02:00
konstin
4e73ace0df allow the track info dialog to override the default lap number for a track 2014-07-25 14:06:04 +02:00
hiker
fbf5bf4166 Changed default number of laps to be 3 (and not the number of laps 
used last time), which seems to be a better default. Some minor
cosmetic changes.
 2014-07-24 17:43:11 +10:00
hiker
9267e2d304 Merge branch 'lapnumber' of https://github.com/konstin/stk-code into konstin-lapnumber 2014-07-24 16:48:03 +10:00
Flakebi
277aab1a0e Fix compiling issues without debug mode in my log code 2014-07-23 21:40:46 +02:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
Flakebi
a9a46a2dd6 Some little fixes 2014-07-22 12:54:10 +02:00
konstin
ec73fcb2b7 minor stuff 2014-07-16 15:40:27 +02:00
Sachith Hasaranga Seneviratne
16e6401fab Merged master, resolved conflict in CMakeLists.txt 2014-07-15 22:28:20 +05:30
konstin
b8202b580d Merge branch 'master' of https://github.com/supertuxkart/stk-code into laps 2014-07-15 15:46:23 +02:00
konstin
02f2488502 add default_number_of_laps 2014-07-15 15:46:17 +02:00
vlj
f1ddf87a5f Plugin displacement material. 2014-07-14 02:25:03 +02:00
Marianne Gagnon
f00c55850a Remove old way of doing displacing, turn into a flag in STKMesh. Does not compile, vlj will do the rest 2014-07-14 02:25:03 +02:00
Sachith Hasaranga Seneviratne
f4b357d03c Merged master 2014-07-11 07:04:25 +05:30
Marianne Gagnon
2d847cb6b9 Fix overworld minimap 2014-07-09 23:34:39 -04:00
konstin
4633d82c23 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-07-09 21:19:17 +02:00
vlj
25b5134881 Hack not to add displacement node to scene manager 2014-07-09 03:20:31 +02:00
konstin
ce7da4b237 running whitespace.py 2014-07-08 20:59:34 +02:00
Vincent Lejeune
afd97345f7 Add a global VAO manager 2014-07-08 18:31:45 +02:00
Marianne Gagnon
f37afa88b8 Only assign tangents for mesh buffers that actually use normal maps 2014-07-08 18:31:44 +02:00
Sachith Hasaranga Seneviratne
be9e9a326d Merged master 2014-07-08 18:18:56 +05:30
Sachith Hasaranga Seneviratne
6b70ea36af Bound sfx-emitters to scripts 2014-07-07 14:43:23 +05:30
hiker
c222bbcb1c Merge branch 'a' of https://github.com/konstin/stk-code into konstin-a 2014-07-07 16:15:34 +10:00
Sachith Hasaranga Seneviratne
d5d0ffceb4 Bound particle emitters to scripts and added move functionality 2014-07-05 08:54:49 +05:30
Sachith Hasaranga Seneviratne
6af28141a4 Merged master 2014-07-05 06:58:43 +05:30
Marianne Gagnon
1f5dd2fff3 Improve moving objects in library behavior. 2014-07-04 20:42:06 -04:00
Marianne Gagnon
3f8bff33f3 Improve a bit more movable objects in library 2014-07-04 19:59:22 -04:00
Marianne Gagnon
41c47e59be Slightly improve behavior of moving objects in library. A problem still remains 2014-07-04 19:50:46 -04:00
Sachith Hasaranga Seneviratne
3573452519 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-07-03 07:39:09 +05:30
vlj
475d738d4b Merge remote-tracking branch 'origin/NewRTTMinimap' 2014-07-02 00:24:03 +02:00