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

896 Commits

Author SHA1 Message Date
hiker
dd04c11260 Sort tracks first by locked/unlocked status, then alphabetically. 
Added support for special sort names for each track (e.g. 'The Island'
can be sorted as 'Island' etc).
 2014-05-28 17:15:00 +10:00
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
3cb24f55d5 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-05-26 16:58:16 +05:30
hiker
36cbb18e27 Fixed compiler warnings. 2014-05-24 12:07:47 +10:00
sachith500
867f1607dd Action triggers addressable by name, scripts can enable/disable action triggers 2014-05-23 14:39:03 +05:30
sachith500
4578ddc073 Added animation enabling and reactivation 2014-05-22 12:39:46 +05:30
Sachith Hasaranga Seneviratne
27de7c6f3c MERGE STK into scripting branch 2014-05-19 08:27:15 +05:30
konstin
b3247ef215 Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel 2014-05-17 17:14:29 +02:00
hiker
71603816fa Merge remote-tracking branch 'origin/master' into new_login 2014-05-16 14:21:13 +10:00
Marianne Gagnon
2b7dc07cda Fix crash-on-second-load bug 2014-05-15 19:41:44 -04:00
konstin
1e1633b88f Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel 2014-05-15 21:49:46 +02:00
hiker
d9daf928e5 Merge remote branch 'origin/master' into new_login 2014-05-14 14:06:06 +10:00
vlj
1073335f4d Fix sun light 2014-05-14 00:50:25 +02:00
vlj
5fd41a2f2c Light: Import distance properly. 
Also remove some silly default param for addlight that could make
argument passing not obvious.
 2014-05-14 00:32:36 +02:00
konstin
6f9ae6e510 get back into working state 2014-05-12 14:59:09 +02:00
Guillaume P
326c707458 Clear the reminder of the origin file name of textures in Track::cleanup(). 2014-05-08 20:20:35 +02:00
Guillaume P
deb74f4a00 Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option 
Conflicts:
	src/graphics/glwrap.cpp
 2014-05-08 18:40:14 +02:00
hiker
00cf9a3dbe Merge remote branch 'origin/master' into new_login 2014-05-05 09:20:37 +10:00
Marianne Gagnon
654651215a Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-05-04 18:54:46 -04:00
Marianne Gagnon
5acb763ac8 Work on cutscenes 2014-05-04 18:54:37 -04:00
Vincent Lejeune
849467d281 Unload texture transformation state cache. 2014-05-04 20:25:16 +02:00
Marianne Gagnon
dc5d7f707d Work on GP end cutscene 2014-05-03 19:19:00 -04:00
Marianne Gagnon
1b7c9ee1e2 Initial work to port GP win/lose cutscenes to new system 2014-05-02 18:47:43 -04:00
Guillaume P
7a3ba812d7 Use smaller textures when HD textures option is disabled. Generate them if they are not already in the cache directory. 2014-05-02 19:16:54 +02:00
hiker
3b8d988cd2 Fixed compiler warnings. 2014-04-30 11:34:53 +10:00
vlj
c5fbd5ff84 Reenable ability to change exposure/lwhite. 2014-04-25 00:59:02 +02:00
Marianne Gagnon
5373390fac Load textures for ambient lights separately from skybox textures 2014-04-21 20:25:51 -04:00
Marianne Gagnon
f0b61c98d7 No longer create an obsolete irrlicht water node. To be replaced by a better water shader 2014-04-19 20:24:43 -04:00
Marianne Gagnon
99a50ec70c misc little changes 2014-04-13 14:25:10 -04:00
konstin
9d22b74b54 Fixing compilation issues on linux 2014-04-11 20:14:20 +02:00
Marianne Gagnon
f42e4203cd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-09 18:55:22 -04:00
Marianne Gagnon
c2fb05cc61 Compute tangents for core track mesh, allowing normal maps 2014-04-09 18:55:17 -04:00
hiker
43593d6312 Made getCurrentUser() a static function. 2014-04-08 08:06:52 +10:00
Marianne Gagnon
a413fa3f15 Add proper instancing fallback when shaders are off 2014-04-06 18:46:25 -04:00
Marianne Gagnon
456d57f7ce Instancing : don't crash when shaders are off 2014-04-06 18:31:15 -04:00
Vincent Lejeune
bb311618e3 Instancing: Add support for scale transformation. 2014-03-31 18:10:45 +02: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
Marianne Gagnon
d90c3753df Pass absolute rotation, not relative rotation 2014-03-28 21:05:21 -04:00
Marianne Gagnon
9406d69a72 Cleanup instancing nodes when cleaning track 2014-03-28 18:46:52 -04:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
vlj
71881ac64d Add orientation to grass material 2014-03-25 16:49:03 +01:00
Sachith Hasaranga Seneviratne
6385937668 Revert "Trigger now has access to kart that triggered it" 
This reverts commit 88de3ebfb7.
 2014-03-24 11:12:51 +05:30
Sachith Hasaranga Seneviratne
88de3ebfb7 Trigger now has access to kart that triggered it 2014-03-24 09:05:28 +05:30
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
ae92b4007b Add initial basic support for loading instancing nodes 2014-03-22 20:55:30 -04:00
Sachith Hasaranga Seneviratne
c1b8927b31 Cleaned up a bit 2014-03-21 15:31:28 +05:30
Vincent Lejeune
4af050e1c0 Bring back minimap. 2014-03-18 23:47:40 +01:00
Marianne Gagnon
3d6fd8e792 Add patch to mention firing back in tutorial 2014-03-17 18:52:36 -04:00
Sachith Hasaranga Seneviratne
9ac9cfbdca Added additional script support for removing track objects tested with farm track with the haybail.as script 2014-03-17 18:12:03 +05:30
Sachith Hasaranga Seneviratne
35be1f142a track objects can be enabled/disabled/their status can be checked on, TODO: move this to scripting 2014-03-17 09:26:24 +05:30
Sachith Hasaranga Seneviratne
f1a4df7127 Added stuff to track object presentation 2014-03-16 12:26:35 +05:30
Vincent Lejeune
ce12ebe9ce Bring back minimap. 2014-03-15 20:05:04 +01:00
hiker
0208dbaf8a Fixed #38, fixed #1230 (which is a duplicate). 2014-03-06 17:11:22 +11:00
hiker
38bdca2038 Fixed typo. 2014-03-03 09:17:45 +11:00
hiker
4d6b110e56 Removed unnecessary #include of user_config.hpp in other hpp files 
(to reduce the amount of recompilation when user_config.hpp is changed).
 2014-02-26 12:52:16 +11:00
hiker
55665e21a3 Removed some compiler warnings. 2014-02-20 08:55:35 +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
0228b82ef4 Fixed incomplete merge. 2014-02-11 07:41:35 +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
97be85777d Started to move current player info from unlock manager into 
player_manager.
 2014-02-09 23:22:45 +11:00
Deve
57d0975c50 Avoid some code duplication. Thanks to sachith500. 2014-02-02 10:53:33 +01:00
Deve
091a7c7c5d Add sachith500 patch which allow to display message when doors are closed in overworld. 
I sightly modified it - currently less changes are needed in the exporter.
 2014-02-01 12:24:50 +01:00
hiker
31063f6ae5 Removed unnecessary \n. 2014-01-31 15:45:53 +11:00
hiker
ade89ba89a Merge branch 'master' of https://github.com/KroArtem/stk-code into kroartem 2014-01-31 15:39:53 +11:00
hiker
9ef4885db6 Merge branch 'gravity_from_normal' 2014-01-31 08:36:28 +11:00
hiker
9db2d405ef Removed hardcoded 'up' direction for the raycast for terrain detection. 2014-01-30 17:08:39 +11:00
KroArtem
b80548a46e fix some coverity issues 2014-01-30 03:19:41 +04:00
Vincent Lejeune
57808f0815 Disable water, bgnodes and textbillboards. 2014-01-29 01:57:34 +01:00
Vincent Lejeune
8a04c48cec Reset skybox texture when loading track. 2014-01-27 01:14:20 +01:00
hiker
083c2d42bd Properly fixed position of physical bodies when they are animated 
(thanks to auria).
 2014-01-26 13:35:35 +11:00
Marianne Gagnon
3d054ea91b Bunch of small code cleanup 2014-01-25 21:05:07 -05:00
Marianne Gagnon
8295a1e226 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-24 18:49:56 -05:00
Marianne Gagnon
190cc9fa9a Clarify a couple error messages 2014-01-24 18:48:40 -05:00
hiker
93cb4b2090 The position and rotation of an IPO animated physical object from a library 
must be transformed by the transform of its (graphical) parent (only library
nodes have a graphical parents) to be correct.
 2014-01-24 23:44:46 +11:00
hiker
9651a9f224 Minor code cleanup, renamed a variable and function. 2014-01-24 22:25:55 +11:00
Marianne Gagnon
583092bbf8 Don't return pointer to temporary object 2014-01-22 19:03:55 -05:00
Vincent Lejeune
c9ad17cae1 OGL32CTX: Fix draw of karts and minimap 
But it is rendered upside down...
 2014-01-22 01:45:21 +01:00
Vincent Lejeune
0d57f4db0d Hack to make displacing object non animated and thus STKMeshes. 2014-01-21 18:42:19 +01:00
Marianne Gagnon
5a2ad7c8aa Create mesh with tangents if needed in track objects too 2014-01-17 19:16:01 -05:00
Marianne Gagnon
95103c988f respect the new flag and avoid creating animated meshes where unecessary 2014-01-17 18:55:47 -05:00
Marianne Gagnon
ec40e2f7fc Undo the hack to always use tangents with LOD meshes, now that the exporter correctly exports the tangent flag 2014-01-17 18:36:38 -05:00
Vincent Lejeune
7da65c15f0 Enable tangents on every lod instance and fix normalmap 
This will increase the memory footprint of lod object,
however this is the only way I found to make meshbuffer using
GE_NORMAL_MAP to provide the necessary info to this shader.

Now the pedestal in overlord looks perfectly normal mapped.
 2014-01-17 21:55:25 +01: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
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
auria
26e0f61e23 Properly clean up LOD nodes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14963 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 23:24:43 +00:00
hikerstk
b6e98d9e2f Fixed #1143 - untextured ground is not a valid start position. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14959 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 05:48:16 +00:00
auria
4f75e31b72 Fix billboard fade effect when billboard is parented 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14958 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 02:22:03 +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
6e3466c838 load material.xml from libraries 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14946 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-06 23:29:12 +00:00
hikerstk
6ee751e3c3 Added new class to handle command line parameters, which 
simplifies parameter handling in main (e.g. it's not
necessary to list and ignore parameters in the 2nd
pass, when they were handled in the first pass).
Removed some command line options for which there
is a guy (e.g. --weather), or which are not really
useful (--list-karts). 

All parameters to options must now consistently be
specified using '=', e.g.: --log=1 and --kart=tux.

Also removed support for 'classic' camera (which was
not used anymore). Removed now unneccessary #include
in user_config.hpp, which made some #include changes
in other files necessary.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14939 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-06 12:23:16 +00:00
auria
d095e14039 Bugfix with new lod 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14895 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-02 23:44:13 +00:00
auria
5da3b32be9 support rotation and scale on library objects 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14886 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-02 01:42:45 +00:00
auria
ea7231170a Remove unused light distance property 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14884 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-02 01:27:15 +00:00
auria
93643d660f misc minor stuff 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14880 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-01 21:21:48 +00:00
auria
0f97aee66a Remove the old LOD loading code, we now support only the new much cleaner way. Will need to re-export all tracks that use LOD, meanwhile LOD objects will be missing from tracks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14879 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-01 21:18:06 +00:00
auria
be691c9afc Do not report the new <lod> XML node as an unknown node type 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-31 20:27:13 +00:00
auria
56dcb9b3a2 Add support for a new way of loading LOD definitions, that should eventually fully replace the previous method (instead of exporting LOD definitions as standard objects that can appear anywhere in the XML file, group them in a <lod> section, this way we can load all LOD definitions right at the start of the load sequence, instead of the delayed creation hacks we do atm). Old code still in place for now, since we have a lot of tracks using the old way 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14857 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-31 19:49:53 +00:00
auria
5cd71bdc96 Fix LOD objects in a library 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14854 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-31 18:45:18 +00:00
auria
3cdf3409bf Refactor LOD to allow parenting 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14853 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-31 18:09:13 +00:00
auria
43f4d1cdfb Update track objects with the ability to have a parent, getting us one step closer to the library 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14847 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-31 00:24:07 +00:00
auria
0829c150ca Simplify code to use the file manager instead of hardcoding paths 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14844 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-30 23:10:43 +00:00
auria
392f63d1a1 More work for library nodes. Remove some code that hardcoded search paths, let's just use our file manager for that, it does it right and easier 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14843 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-30 23:00:59 +00:00
auria
36fc36c7fb Add initial library object loading code. Not complete yet. Samuncle, this is for you ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14840 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-30 22:32:30 +00:00
auria
ad3ea6c5e0 Remove uneeded code 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14823 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-28 02:10:12 +00:00
auria
6b4d91effa Misc code style improvements and warning fixes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14819 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 23:56:42 +00:00
auria
14655bcdb9 Change lights to be TrackObjects, so that they can be animated. Exporter part not yet committed 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14818 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 23:55:57 +00:00
deveee
4dd0c066df Fixed problem with distance in my previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 22:02:52 +00:00
deveee
27e397d2c7 Fixed #1086 - Popup message was displayed constantly when you were in garage in overworld. 
TODO: Compare distance between garage and kart with for example length
of the kart or distance of object defined in scene.xml.
Currently (m_garage_pos-m_kart_pos).length2_2d() gives much higher values than
getKart(0)->getKartModel()->getLength() and I must look at this closer.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14804 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 02:12:16 +00:00
vincentlj
c9b8734717 Plug-in energy parameter into pointlight shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-24 23:07:42 +00:00
hikerstk
c450c97472 Allowed the music directory to be external. Renamed 
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 22:29:08 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories 
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 23:48:47 +00:00
deveee
ec13bcf802 Merge branch 'hilnius' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:28:55 +00:00
samuncle
5b5fd87a8b Add two per track parameter for color correction 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14633 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 16:33:14 +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
hilnius
262f70205c merging trunk and fixing compilation issues 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 10:05:34 +00:00
deveee
5e90c9fa6b Add patch by lennartack to avoid segfault when game is running with --no-graphics parameter 
Ticket #1029

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-31 07:51:37 +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
hilnius
ea2b52a663 merging hilnius's branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 18:03:11 +00:00
unitraxx
8656a12d12 Undoing last commit which was not what I wanted after all. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 22:05:06 +00:00
unitraxx
75e286932f An attempt to merge with hilnius' branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 21:39:27 +00:00
hilnius
a20c200b77 merging uni's branch. one bug appeared back 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13386 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 00:41:47 +00:00
unitraxx
1d90f554e8 Merging with trunk, aesthetic changes, and added virtual keyword to the destructor of Track_object.hpp because of errors. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13376 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 17:27:06 +00:00
hikerstk
f16244e3d0 Added support for physics-only meshes (i.e. invisible walls), see #1014. 
Some changes to the exporter still required.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13219 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-14 21:57:34 +00:00
hikerstk
1639791378 Fixed indentation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13166 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-10 22:47:53 +00:00
hilnius
acf1ff548a fixing a segfault caused by mipmaps in --no-graphics mode and adding a connect to peer protocol (for the server) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13116 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-07 22:23:13 +00:00
auria
8e2ccb7762 Fix restarting tutorial 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13086 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 00:02:50 +00:00
hikerstk
4616338fd6 Started to fix rescue problem - more code cleanup will follow later. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-28 23:45:48 +00:00
curaga
9ddeac772a Likewise for userconfigparams 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-26 13:32:02 +00:00
curaga
ead8c059cb Remove some unused irr_driver includes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-26 13:31:38 +00:00
auria
31c148752b Remove useless logging 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-23 22:40:18 +00:00
hikerstk
3c2846d48e Added support for specifying the 'time' for waves, since the old way 
of using 'speed' it is very hard to make sense of the value (2*pi*speed/1000
= time in seconds). This still needs to be supported in the exporter though.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12859 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-13 10:49:14 +00:00
hikerstk
637dbf043f Fix #199: speed of 0 makes water disappear. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12858 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-13 07:38:57 +00:00
auria
485551aa89 Apply patch by KroArtem to fix minor issues : unused variables and other minor warnings from cppcheck, crash when launching from terminal with AI karts in a mode where AI is not supported 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12857 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-09 20:04:07 +00:00
hikerstk
a529a07c99 Fix #981: karts are sometimes rescued when restarting, or facing the 
wrong direction. Reason was an incorrect rotation in the projection
code. Instead of fixing it, I let the kart fall a little bit, so the
code is now correct, much easier to understand, and the bounce after
a reset fits the game imho.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-06 23:08:52 +00:00
curaga
a6a2ec66d4 Make fatal fatal 
Removes a lot of duplicated code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12827 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-31 14:09:39 +00:00
curaga
57c3cbae3e Space cleanup pass on the headers 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-30 19:47:39 +00:00
curaga
b56bf4dc53 Remove trailing space, git doesn't like it 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-29 22:04:35 +00:00
hikerstk
c144d0a932 Fix #963 (replace printf), thanks to m0leman. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12783 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-24 23:51:08 +00:00
hikerstk
7460418153 Code cleanup: renamed kinetic to 'is_dynamic' in order to follow the categorization of 
different rigid bodies in bullet. Some layout fixes, removed unused or unnecessary
functions and constructors.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-19 22:02:34 +00:00
hikerstk
40c02fba2e Fixed #973: the main track mesh added to the bullet physics twice, since 
the index 'main_track' was set at the wrong location (before the main
track was loaded, see r9757). Also removed unnecessary loop when reading
track.xml files.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12756 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-14 13:53:43 +00:00
hikerstk
5648939d8f Fix clang warnings (#922). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12668 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-17 12:09:04 +00:00
hikerstk
8ed288e81d Added a separate ChallengeModeType as preparation for the 
challenge for highest AI. Mostly this is a cleanup only.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-15 12:39:45 +00:00
auria
b667501fa1 Show explanatory message when approaching tutorial in overworld 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12635 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-10 23:13:29 +00:00
auria
7454a133d8 Fix challenge orbs missing on overworld 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12634 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-10 23:04:51 +00:00
auria
b182e71865 Two unrelated changes : make scene node presentation fault-tolerant, and add fallback support for old XML xyz syntax 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12629 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-10 01:29:48 +00:00
auria
b502c96409 Allow LOD nodes to have a physical body 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12617 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-06 00:29:45 +00:00
auria
a4f44ecebd Fix leaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-05 23:38:58 +00:00
auria
61720b2661 Add back ability to programmatically add track objects, use it in 3 strikes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12610 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-05 01:30:34 +00:00
auria
6bc216f203 Add full support for LOD in track objects 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-05 00:20:14 +00:00
auria
d807871ec6 Bring back LOD + particles 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-04 23:02:15 +00:00
auria
8bae4c1549 Minor cleanup 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-04 22:57:07 +00:00
auria
27d454ad05 Move some track object classes to new files 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-04 22:52:37 +00:00
hikerstk
ca39376f25 Fixed windows compilation, updated VS9 project file. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-04 01:32:45 +00:00
auria
bc1d1e7d31 First part of track object refactor 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-04 01:15:37 +00:00
hikerstk
b967e5a492 Fixed addons management (deleting), which I broke in r12581: Addons used 
their id as directory name (and since the id was changed to have addon_
as prefix, this didn't work anymore).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-27 21:01:05 +00:00
hikerstk
2ed38db288 Fix #890 - crash when deleting tracks (caused by not adjusting 
indices in main track group when a track is deleted. That happened
since the soccer mode was added).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-27 12:17:09 +00:00
hikerstk
f78f254a3e Fixed #894: nameclash when an addon track/kart has the same directory name (and therefore 
identifier) as a track included in STK.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-26 06:16:53 +00:00
hikerstk
62ea0bbbe0 Fixed various compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12542 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-06 23:12:24 +00:00
hikerstk
502042432c Big refactoring: the camera for a kart is now not part of the 
kart anymore, instead they are managed by static functions
in Camera. This allows us to have several cameras for one
kart now (can be useful for debugging; or for three-screen setup
where you have one monitor for left, right, and center; or potentially
for an back mirrir). Also 'rain' is moved into camera now (where it
belongs more naturally then in kart), and several loops over all
karts searching for a camera are now replaced by simpler loops over
all cameras (though a few loops were added to handle code for all
cameras now, while before there as no loop).
Main advantage: handling post-processing will be easier to do now.
Also this fixes a bug: in split screen mode, when a kart is eliminated
(ftl) the camera for this kart was supposed to show the
leader facing backwards, which didn't work (it just showed the previous
location of the elimintaed kart) - now it works.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12541 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-06 22:08:41 +00:00
hikerstk
e1033ca9f7 Started to restructure rendering loop - moved things out of rendering 
loop, cleaned up code, ...


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12531 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-28 01:05:27 +00:00
hikerstk
392a1397e9 Fixed Easter Egg mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12515 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-18 21:26:39 +00:00
hikerstk
b56ad00816 Avoid accessing NULL pointer (in case of an error). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12514 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-18 21:04:27 +00:00
auria
bfe2600986 Fixed door to nolok's castle wouldn't open anumore since tutorial was added 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12508 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-17 20:08:05 +00:00
auria
6147636454 Add tutorial to overworld 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12487 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-16 00:52:28 +00:00
funto66
07c74c41b5 Merge soccer mode back into trunk - but still WIP, can be disabled via a #define in race_setup_screen.cpp 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12475 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-11 22:30:50 +00:00
hikerstk
8fffd4f34d More Log:: calls. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12409 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-22 22:50:41 +00:00
hikerstk
bc237e8cef Cleaned up "/" usage (avoid "//"), and in the way fixed problems 
with textures that were not found (due to ealier not completely
finished clean ups).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12404 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-21 23:27:39 +00:00
hikerstk
4410101721 Remove the usage of '//', which isn't properly supported by Irrlicht's CFileList 
("a/b" and "a//b" on a file archive are not equal) and is not necessary.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-21 05:37:33 +00:00
auria
da961e2ca8 Minor cleanup 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-19 21:43:21 +00:00
auria
4dc3589086 More tutorial work 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12388 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-19 00:46:03 +00:00
auria
c44dbf4214 Work on tutorial 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12373 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-17 02:20:12 +00:00
auria
6455be9620 Work on tutorial 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12369 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-17 00:49:39 +00:00
auria
996c563f9c First version of tutorial. Far from finished but you can take a quick look if you wish; the text is currently at the bottom 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12350 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-14 00:35:44 +00:00
hikerstk
b2a9907740 Fixed #856: when changing resolution overworld did still 
assume that the textures were cached.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12348 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-10 01:02:19 +00:00
auria
981143bf87 Experimental support for dynamic lights. Doesn't work too well due to our use of a global sun, though could work in a dark track with little sun 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12332 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-05 18:49:31 +00:00
funto66
4c160eb065 Fixed random soccer arena selection + WIP GUI for soccer setup screen 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12327 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-02 18:11:11 +00:00
funto66
cd28f9128a Now teleporting the soccer ball at its start position when scoring a point 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12314 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-28 14:11:33 +00:00
funto66
14f7f080c0 CheckGoal now is just a CheckStructure and not a CheckLine anymore. This fixes bugs due to arrays sized with the number of karts instead of the number of soccer balls 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12313 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-27 22:09:08 +00:00
funto66
bd70940af9 git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12312 178a84e3-b1eb-0310-8ba1-8eac791a3b58 2012-12-27 17:10:02 +00:00
funto66
d6327b1ef4 Forgot to commit check_goal.cpp 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-27 16:12:10 +00:00
funto66
1da4be10e3 Added code to export goal lines 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-27 16:09:11 +00:00
funto66
8da37e6eb2 Added some missing tests for isSoccer() 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12301 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-22 23:06:42 +00:00
funto66
e16c03edf2 Added a special type of tracks for soccer arenas 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12300 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-22 22:33:15 +00:00
hikerstk
29be45b198 Added preliminary easter-egg mode. It still needs a icon (battle mode 
used atm), and a better easter egg model (atm bunny from snow mountain,
... whith turns out has lost the black nose). One track has easter eggs
added (math class).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-17 00:33:47 +00:00
auria
78d964b79d try to fix sound leaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12222 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-09 23:30:26 +00:00
auria
b157227e51 Properly place icons on minimap when the allocated texture was bigger than needed to accomodate drivers/gpus that quite POT textures 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12015 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-20 01:28:04 +00:00
hikerstk
e727e34b9d Fixed compiler warning. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11959 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-16 12:34:49 +00:00
auria
1b86065775 Add doors in overworld, that block Nolok's challenge until the end 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11955 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-16 00:42:38 +00:00
hikerstk
53cccb87da Made non-reverse the default for all tracks; added 
'reverse=yes' to all tracks.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11935 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-14 01:45:43 +00:00
hikerstk
367e8b18dc Disable auto-rescue in arenas by default. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-08 22:44:42 +00:00
hikerstk
c316abda19 Added setting to disable push-back and auto-rescue for 
each track. Manually set those in overworld.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11900 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-08 06:02:35 +00:00
hikerstk
a65147cad5 Bowling balls will only affect karts that are 
directly hit now.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-04 12:57:03 +00:00
hikerstk
b1caec75a1 Fixed comments and removed tabs. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11845 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-10-31 00:41:39 +00:00