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

339 Commits

Author SHA1 Message Date
hiker
29c162bdf8 Fixed compiler warnings. 2014-09-23 08:56:07 +10:00
Flakebi
9bcc76127f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-17 13:20:09 +02: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
118db58a02 Merged Master 2014-09-07 11:28:15 +05:30
Flakebi
5858c05e74 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-05 22:46:17 +02:00
vlj
8da557d153 Use GLEW for our GL function support. 2014-09-05 18:21:07 +02: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
Flakebi
a31ec772ff Replace accidently placed tabs 2014-09-02 03:57:48 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
Sachith Hasaranga Seneviratne
a695c197b2 Merge master 2014-08-13 12:12:51 +05:30
hiker
940a296366 Merge remote branch 'origin/master' into leyyin 2014-08-11 09:05:34 +10:00
Deve
99ce91dc46 Strength of bouncy edges should depend on soccer ball mass. 2014-08-08 23:07:03 +02:00
hiker
03160e3b7b Increase the brake force the longer the brake key is pressed (before it 
took ~1.6 seconds for a kart to stop, now 0.5; while hardly any change to
short brakes to slow down the kart a bit only). Also made the impulse to
keep karts parallel to the ground configurable.
 2014-08-06 07:52:02 +10:00
hiker
44da1fb4f2 Keep flying karts parallel to the ground in the physics, not outside. 
This avoids odd side effects that happened before (e.g. very bad collisions
with track; problems when dropping karts on rescue on the walldriving branch).
 2014-08-05 08:21:52 +10:00
Sachith Hasaranga Seneviratne
c3a774fcc9 Merged master 2014-08-01 18:40:05 +05:30
Flakebi
bc458c42d3 Apply per-player difficulty 2014-07-30 22:26:59 +02:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
Sachith Hasaranga Seneviratne
f4b357d03c Merged master 2014-07-11 07:04:25 +05:30
konstin
ce7da4b237 running whitespace.py 2014-07-08 20:59:34 +02:00
Sachith Hasaranga Seneviratne
be9e9a326d Merged master 2014-07-08 18:18:56 +05:30
Sachith Hasaranga Seneviratne
008bf124ba Added different types of collision triggered scripts. Only available on a couple of tracks for testing at the moment 2014-07-08 17:52:47 +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
Sachith Hasaranga Seneviratne
850ec1124e Added kart-physical object collision detection and made the barrels on hacienda removable via colliding with them (No speed logic implemented in scripts yet) 2014-07-04 11:14:44 +05:30
hiker
80d09825bb Fix (potential) problem with exponential spring response (which is 
not used atm).
 2014-07-03 16:53:12 +10: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
hiker
2b6e1b8432 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-01 09:51:56 +10:00
Deve
ff6af6b072 Change power of bouncy edges in soccer field as temporary solution for #1367. 
Ideally power of bounce should depend on soccer ball weight.
 2014-06-30 18:20:31 +02:00
hiker
621539849a Removed unused code. 2014-06-30 16:45:00 +10:00
hiker
be76aae256 Interpolate the normal for the gravity to allow smoother changes of 
gravity - though it does not improve the bumpiness on twisted road section.
 2014-06-29 22:53:35 +10:00
Sachith Hasaranga Seneviratne
75ed68ac58 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-06-08 20:32:08 +05:30
hiker
3cd2b97202 Added missing operator-(Vec3, btVector3). Without this operator 
additional typecast where necessary on VS when computing
Vec3-btVector3.
 2014-06-06 09:36:12 +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
5619509ebb Prevent NANs/crash. 2014-06-05 08:59:24 +10:00
Sachith Hasaranga Seneviratne
2f57a14c87 On hitting a physical object with any item, the physical object is now removed (vanishes), can be tested on tutorial by shooting bowling balls at the boxes 2014-06-02 16:09:33 +05:30
Sachith Hasaranga Seneviratne
43f78a6a54 Added accessor methods for ID, set disabling/enabling/status checking to work for IDs as well 2014-06-02 13:07:51 +05:30
Sachith Hasaranga Seneviratne
038aaa6f3b Hitting a physical object with an object now triggers a message (Test in tutorial by shooting at the boxes). All currently suppported collision types now denote the type in the message that appears. 2014-05-29 18:51:48 +05:30
Sachith Hasaranga Seneviratne
870f438b06 Removing animations now also removes the corresponding PhysicalObject as well. Additionally opened up the PhysicalObject class to allow for the setting of the interaction type with the future goal of exposing it to scripts 2014-05-29 17:37:13 +05:30
sachith500
6f58864df0 Added namespaces Scripting, Scripting::Physics. Moved collision script code and function,callback binding to Scripting::Physics 2014-05-27 11:57:44 +05:30
sachith500
8c5606be08 Karts involved in collisions addressable by ID 2014-05-26 20:30:27 +05:30
sachith500
31f7ea7c89 Added very basic collisions 2014-05-26 18:03:41 +05:30
Marianne Gagnon
00ea15b7bb Yet another fix to pre-c++2011 compilation..... (not trying to raise my commit count, I swear!!) 2014-05-10 20:53:51 -04:00
Marianne Gagnon
7808fc8a09 Yet another fix to pre-c++2011 compilation..... 2014-05-10 20:50:18 -04:00
Marianne Gagnon
522ad01a27 More to fix pre-c++2011 build 2014-05-10 20:46:56 -04:00
Marianne Gagnon
fbd33420c2 cull by distance, to improve performance 2014-05-10 20:38:10 -04:00
Marianne Gagnon
4e9f199008 Save raw floats and not vectors 2014-05-10 19:50:24 -04:00
Marianne Gagnon
486d5c291f Batch physics debug rendering 2014-05-10 19:26:14 -04:00
Vincent Lejeune
46a832a67f Reenable physic debug mode 2014-05-11 00:52:19 +02:00
Marianne Gagnon
4bddf29320 Fix bullet assertion failure 2014-04-29 19:48:54 -04:00
hiker
43593d6312 Made getCurrentUser() a static function. 2014-04-08 08:06:52 +10:00
Marianne Gagnon
7cd93708cf Merge remote-tracking branch 'konstin/spaces' : Remove trailing spaces, use spaces and not tabs for indentation 2014-03-30 11:25:16 -04:00
Marianne Gagnon
d08e81ab56 Improve behavior when using instancing with physics objects 2014-03-29 18:39:15 -04:00
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces" 
This reverts commit 65e2dcf2f0.
 2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
hiker
f8a462a39f Added support for different types of achievement checking: besides 
'all-at-least' (all keys must be >= the corresponding goal value) now also
'one-at-least' (at least one key is >= a constant goal value) is supported.
Implemented 'Arch Enemy' achievement: hit the same kart at least 5 times
in one race.
 2014-02-25 17:20:24 +11:00
hiker
2cb1f1fc78 Let only hits from the current player trigger an achievement. 2014-02-24 23:25:56 +11:00
hiker
99fe4388d4 Added an enum to reference the achievements by a name instead of 
an integer number.
 2014-02-24 17:14:42 +11:00
hiker
5fc300d7bb Removed Single and MapAchievent (and Singe/MapAchievementInfo), instead 
using the generic key-value mapping Map* has provided for everything.
Changed format of achievements.xml to be more compact.
 2014-02-24 08:21:15 +11:00
hiker
a3a5d5fc3b Moved achievements data into PlayerProfile (and data is saved in players.xml 
now instead of in a separate achievements.xml file).
 2014-02-20 22:04:03 +11:00
KroArtem
452af6f423 fix typo 2014-02-09 02:16:14 +04:00
KroArtem
cdeab373c3 add assert in case ftell fails 2014-02-09 02:04:22 +04:00
KroArtem
8a731691fd more coverity fixes, get rid of printf 2014-02-01 03:54:34 +04:00
hiker
c80a78dcf2 Made some pointers const. 2014-01-30 12:27:12 +11:00
hiker
41a9b14859 Fixed missing collisions in mansionl (caused by negative default mass 
for objects). Added assert to bullet to catch this kind of problem early.
 2014-01-26 23:36:44 +11:00
Marianne Gagnon
825ee2fdfe Fix compilation 2014-01-24 21:02:21 -05:00
hiker
8389f4afb6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-25 10:41:00 +11:00
Marianne Gagnon
878d0dcf05 Improve profiler a bit 2014-01-24 18:38:47 -05:00
hiker
fb8347e135 When the physics are updated from the graphics, subtract the 
graphical offset again to make sure physics and graphics are in sync.
 2014-01-24 23:46:52 +11:00
hiker
9651a9f224 Minor code cleanup, renamed a variable and function. 2014-01-24 22:25:55 +11:00
auria
37851c7508 Add absolute position getter to trackobject 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15018 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 20:19:58 +00:00
hikerstk
7cdca13d7b Fixed all(?) warnings about signed and unsigned comparisons. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 00:09:19 +00:00
auria
55018ee089 Extend funto's debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 01:51:03 +00:00
hikerstk
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-03 23:02:06 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this 
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:27:55 +00:00
auria
5899a26aad Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-30 21:33:06 +00:00
hikerstk
50c451ac35 Bugfix: forgot to set the actual type. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-25 09:26:29 +00:00
hikerstk
c136bc2bd0 Fixed #1109 by adding a proper constructor to the Settings class 
(which will make sure all fields are initialised).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14576 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-25 06:01:16 +00:00
hikerstk
8247f73604 Replaced tabs with spaces. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-15 12:52:39 +00:00
hikerstk
c5b8732087 Probably biggest commit (in terms of number of files) ever - 
updated the (c) line of all files to -2013, added missing (c), 
changed format in some cases so that it will be easier in
the future to change them by script. No actualy code change.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-15 11:43:21 +00:00
deveee
ac2981584e Avoid crash when object doesn't have texture 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14430 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-14 19:53:10 +00:00
deveee
ea2b34c52e Avoid bounce karts from edges in soccer field. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14428 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-14 19:03:35 +00:00
hikerstk
b4832697c2 Added push back to soccer ball, which can be used to push the ball 
away from the edge of the soccer field (so prevents the ball from
getting stuck there).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-13 22:24:53 +00:00
hikerstk
04d0859f9d Somehwat improved kart and wheel location, so that skid marks appear 
'more' under the wheels. At this stage kart will partially go 'into'
the track when turning though :(  WIP, just to get some feedback, 
this patch need to cleaned up!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-06 00:03:10 +00:00
hikerstk
90ca7db0c2 Made skidlines appear to where the graphical wheels are (still not 
100% correct).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14352 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-30 22:09:48 +00:00
yasin-ghannam
af7aa7fd02 Allowing scorer identification if he shot the ball with a projectile. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14250 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-14 00:51:29 +00:00
yasin-ghannam
70ef7966e1 Modified Soccer Mode results screen. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-14 00:23:20 +00:00
unitraxx
74ec8980d5 client-sid of achievements fetching/syncing 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-06 17:56:05 +00:00
unitraxx
f38106ce77 Achievements looking good. Only server syncing and server-side need to be done. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13635 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-06 00:06:59 +00:00
curaga
f83a30db47 Some more header cleanup 
Now it only takes 38s to build after touching irr_driver.hpp, vs prev 1m 10s.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 12:13:23 +00:00
unitraxx
2711744ed8 merge with trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13477 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-15 00:20:28 +00:00
auria
2693043395 The hayball in farm will now flatten you (exporter still left to do) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13473 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-13 00:36:37 +00:00
hikerstk
df9d90b342 Merged bubble bum branch into trunk. The new bubble gum 
shield is still work in progress.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13444 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-08 03:11:03 +00:00
hilnius
ed6e4ebfb4 correcting the ai kart bug due to the former networking removal 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 12:01:29 +00:00
hilnius
2a0a9a3617 merging uni's and hilnius's branches in networking 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 17:24:20 +00:00