Commit Graph

139 Commits

Author SHA1 Message Date
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
hiker
94da45238c Renamed GameSlot to StoryModeStatus to better describe its function. 2014-02-17 23:16:53 +11:00
hiker
f2e6126f8d Renamed Challenge to ChallengeStatus (to better describe what
this class is doing).
2014-02-17 22:20:23 +11:00
hiker
2b4729a145 Renamed player.?pp to player_profile.?pp (to follow our style
guide); removed unnecessary #includes.
2014-02-17 20:10:29 +11:00
hiker
8b7754cd4f Merge remote-tracking branch 'upstream/master' into new_login
Conflicts:
	src/challenges/game_slot.cpp
	src/states_screens/kart_selection.cpp
	src/tracks/track.cpp
2014-02-10 21:37:04 +11:00
hiker
78b73aa3c8 Added new player manager, and started to replace the saved data
from user_config with player manager.
2014-02-06 14:43:47 +11:00
Vincent Lejeune
477dc093e3 GPUParticle: Use .hpp extension and reformat files now that I discovered how to force VS to emit space instead of indent. 2014-02-02 21:13:03 +01:00
Vincent Lejeune
c77ffb1882 STKBillboard: Create new SceneNode wrapper. 2014-01-27 17:33:08 +01:00
Vincent Lejeune
9a5bf69ca8 STKMesh: Add an animated variant
Not customised atm.
2014-01-23 19:14:13 +01:00
hiker
1930c362d5 Updated source file list (forgot to update this when removing some files). 2014-01-22 08:05:47 +11:00
hiker
260f4f148d Reworked the login and register dialog to be a screen - still
work in progress (and guest login does not work yet).
2014-01-20 21:39:59 +11:00
hikerstk
428f74d859 Removed old network_http and related data structure. Its function
is now either in the addons/news_manager, or in Online::RequestManager.
Also added leack check and copy-preventing to online/Request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 05:21:48 +00:00
vincentlj
c3a4f7d8ce Use a custom stk mesh
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 21:30:17 +00:00
hikerstk
54e6396df6 Renamed HTTPManager to RequestManager, and split request
into three files request, http_request and xml_request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 04:57:58 +00:00