ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,537 Commits 9 Branches 28 Tags 433 MiB
11c4b41f13
Commit Graph

152 Commits

Author SHA1 Message Date
Flakebi
5d36b95c95 Merge remote-tracking branch 'upstream/master' into kart-properties 
Conflicts:
	data/stk_config.xml
	sources.cmake
	src/karts/kart.cpp
	src/karts/kart.hpp
	src/karts/kart_properties.cpp
	src/karts/kart_properties.hpp
	src/tracks/track.cpp
 2015-07-29 02:48:43 +02:00
hiker
0f09649aa8 Force rerun of cmake. 2015-07-18 11:59:52 +10:00
Flakebi
5dec3c4602 Add characteristics 2015-07-08 16:55:10 +02:00
hiker
747aa39bdf Disable artificial shadow if shader-based shadows are available. 2015-07-03 08:12:55 +10:00
hiker
e5a7f27f19 Renamed files to follow our coding style. 2015-05-30 12:16:11 +10:00
hiker
e0ef910137 Renamed TextureRead to TextureShader. 2015-05-17 00:04:19 +10:00
hiker
f0d0e7e601 Moved SharedObjects into separate file shared_gpu_object. 
This also fixes the missing loading screen (likely caused by
not initialising all objects, or not in the right order).
 2015-05-14 16:27:32 +10:00
hiker
dfe4f09ed5 Start to re-implement TextureRead without variadic templates for 
BindTexture and CreateSampler. VERY MESSY ATM, work in progress.
 2015-05-06 16:51:54 +10:00
hiker
262fc0c373 Started refactoring of shaders to follow our coding style. 
One transform feedback buffer shader in particles is done.
 2015-04-23 16:44:26 +10:00
hiker
ddcd6f9ca3 Removed empty files. 2015-04-03 00:05:47 +11:00
hiker
fb58e4b3b3 Use STK's log function in tinyugettext (so all errors/warnings 
are logged to stdout.log).
 2015-04-02 23:59:55 +11:00
hiker
c579eba6db Removed empty file. 2015-03-30 09:58:28 +11:00
hiker
00be07abe6 Force automatic re-run of cmake. 2015-01-05 08:16:08 +11:00
hiker
adaeb37465 Modified sources.cmake to trigger automatic run of cmake. 2014-12-10 14:11:15 +11:00
hiker
2ec5c3765a Added a config file which can be used to disable certain graphical 
options dependeing on card, os, driver version.
 2014-11-15 10:06:54 +11:00
hiker
d20441d45e Modified to trigger automatic cmake run. 2014-11-03 08:34:47 +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
f6aa05ec1c Modified to trigger automatic rerun of cmake. 2014-10-24 10:30:23 +11:00
hiker
de9a1f51a7 Removed empty 'online overview' page, show the achievements page instead. 2014-10-02 07:59:24 +10:00
hiker
9cdbaebd29 Started to add hardware stats reporting functionality. 2014-09-16 22:27:41 +10:00
Sachith Hasaranga Seneviratne
118db58a02 Merged Master 2014-09-07 11:28:15 +05:30
hiker
709583ead5 Removed Random GP dialog. 2014-09-03 17:01:36 +10:00
hiker
db3db6f8b5 First version of the GP info screen (instead of dialog). 2014-08-27 22:08:50 +10:00
hiker
76767141f7 Removed old track info dialog, fixed crashes in track info screen 
(caused when making some spinners etc. visible).
 2014-08-25 22:20:42 +10:00
hiker
c9936ffb97 Forgot to actually add the new files :( 2014-08-25 10:47:36 +10:00
Deve
4584464798 Add icon to exe file as resource. 
It's hard to test for me because currently I can compile it only on virtual machine and it takes long time.
But it should work.
 2014-08-21 21:38:59 +02:00
Sachith Hasaranga Seneviratne
be9e9a326d Merged master 2014-07-08 18:18:56 +05:30
hiker
a65959da42 Replaced upright constraint with simpler code that keeps the kart 
in mid air aligned to the gravity. This will also enable jumps in
section where the gravity is not in the default direction.
 2014-07-08 16:52:09 +10:00
Sachith Hasaranga Seneviratne
6af28141a4 Merged master 2014-07-05 06:58:43 +05:30
hiker
15dbc752d8 Added a space, hoping that this will trigger an automatic run of cmake 
to discover new files to build.
 2014-07-03 14:23:35 +10:00
Sachith Hasaranga Seneviratne
351643c851 Merged master into ScriptEngine by resolving conflict in sources.cmake 2014-06-16 20:56:46 +05:30
hiker
fa2913c937 Try to force an automatic rerun of cmake by a dummy modification of this file. 2014-06-16 22:09:25 +10:00
Sachith Hasaranga Seneviratne
795a6022e5 Revert "Revert "Merge sources.cmake change"" 
This reverts commit 0290564310.
 2014-06-05 12:38:38 +05:30
Sachith Hasaranga Seneviratne
0290564310 Revert "Merge sources.cmake change" 
This reverts commit 03bff8819f, reversing
changes made to 540c7818aa.
 2014-06-05 11:46:11 +05:30
Sachith Hasaranga Seneviratne
03bff8819f Merge sources.cmake change 2014-06-05 11:30:28 +05:30
hiker
8960b79181 Wait for request_manager to be ready to be deleted (i.e. current request 
have been properly aborted, and sign out done). Also shut down more of
STK after signaling the request manager to shut down, so that the user does
not notice the time for the sign out. Also added docs.
 2014-06-05 07:56:51 +10:00
Sachith Hasaranga Seneviratne
27de7c6f3c MERGE STK into scripting branch 2014-05-19 08:27:15 +05:30
vlj
443b758e20 Add shaders to MSVC target. 2014-04-11 20:56:23 +02:00
vlj
ce9e9790d5 Improve VS generation in cmake. 2014-04-11 01:08:29 +02:00
vlj
4259d438b0 Use cmake file pattern tools 2014-04-11 00:57:16 +02:00
Vincent Lejeune
27cccd6102 Fix sources.cmake 2014-03-31 20:12:02 +02:00
Marianne Gagnon
d798398478 Merge branch 'Instancing' of https://github.com/supertuxkart/stk-code into Instancing 2014-03-23 18:55:51 -04:00
Marianne Gagnon
bb28e26eff Cleanup for instancing 2014-03-23 18:55:45 -04:00
Vincent Lejeune
5dd2d28134 Merge branch 'master' into Instancing 2014-03-23 19:20:23 +01:00
Marianne Gagnon
2f2547420d Apply Marc Coll's Grand Prix editor, thanks! There will be refinements to come for sure, but this is a very nice start 2014-03-20 21:13:05 -04:00
Vincent Lejeune
dd5997d277 Start working on instancing library node 2014-03-18 23:47:53 +01:00
Sachith Hasaranga Seneviratne
686dd6c335 Updated new files with the script 2014-03-16 12:44:12 +05:30
hiker
7cb7651c07 Renamed Profile to OnlineProfile to better distinguish the various profiles we use. 2014-03-07 11:02:07 +11:00
Vincent Lejeune
58ef59dcd9 Split stkmesh into mesh and actual scene node 2014-02-22 23:31:27 +01:00
hiker
8f36220b61 Renamed AchievementsSlot to AchievementsStatus. 2014-02-20 23:03:25 +11:00