Marianne Gagnon
0934373fca
Fix GCC build
2015-11-18 19:47:44 -05:00
Marianne Gagnon
5aa342ba30
First set of attempts at optimising lights : reduce and cull more lights as they are out of sight or far. I get a decent FPS boost for this, still a few visual glitches in some tracks and also the code is not too clean
2015-11-18 19:26:54 -05:00
Deve
b78d4a0c3d
Merge pull request #2372 from rugk/patch-1
...
Readme and Install.md improvments
2015-11-18 09:32:00 +01:00
Deve
a69eb99094
Merge pull request #2380 from nado/clang-fix
...
Fixes few warnings at compilation
2015-11-17 15:23:55 +01:00
Nado
d66a70b250
Fixing some -Wunused-variable
2015-11-17 11:42:28 +01:00
Nado
97de0cbc34
Fixing clang only warnings
2015-11-17 11:42:28 +01:00
Marianne Gagnon
708608177a
Fix audio listener positionning issue
2015-11-16 19:13:28 -05:00
auriamg
794908681d
Merge pull request #2379 from Benau/skin_color_font
...
Color the text base on current skin
2015-11-15 18:13:25 -05:00
Benau
f1982c1bee
Fix coloring
2015-11-15 01:24:06 +08:00
Benau
0deb065fe9
Two new skin (Ruby and Forest)
...
Also fix some alignment issue when the multiplayer selection boxes.
2015-11-14 16:28:37 +08:00
Benau
2b0e3b8828
Reverse type and state
2015-11-14 10:38:14 +08:00
Benau
962fe919d2
Color the text (mainly border including title and billboard) base on current skin
2015-11-14 01:06:28 +08:00
auriamg
bc712b5a44
Merge pull request #2378 from Benau/custom_font
...
Allow configurable fonts file names in stk-config
2015-11-12 19:59:26 -05:00
Benau
7cf4d662ee
Allow configurable fonts file names in stk-config
2015-11-13 02:25:52 +08:00
hiker
8b916a7565
Fixed sfx not playing at right location (e.g. bridge in Green Valley).
2015-11-11 23:14:00 +11:00
Marianne Gagnon
6afc34c06b
Try to fix audio potential issues
2015-11-10 21:31:38 -05:00
Marianne Gagnon
bf14e49ea4
Create OpenAL sound sources asychronously
2015-11-09 19:22:06 -05:00
Marianne Gagnon
86d18c0c3e
Merge branch '2360_fix_attempt'
2015-11-09 18:15:02 -05:00
hiker
4ea8bfd4ab
Fixed typo.
2015-11-09 09:17:45 +11:00
hiker
a7547dff23
Try to fix compilation by reducing number of threads.
2015-11-09 09:14:44 +11:00
hiker
a6ea57d09a
Used leyyins code to dynamically adjust number of threads.
2015-11-09 09:07:12 +11:00
hiker
ce219f2fd4
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-11-09 09:04:43 +11:00
hiker
fbff4db589
Increase number of threads to 32.
2015-11-09 09:03:59 +11:00
Marianne Gagnon
b1803b8dff
Apply fix by Benau
2015-11-07 21:48:12 -05:00
Marianne Gagnon
35316c447d
Merge remote-tracking branch 'Benau/ftcleanup#2'
2015-11-07 21:37:47 -05:00
Benau
09a6b9b502
Remove unneeded variable
2015-11-08 10:34:48 +08:00
Benau
cee7cf0b37
Implement better error detection
2015-11-08 10:24:31 +08:00
auriamg
32e54d4f87
Merge pull request #2374 from Benau/ftcleanup#2
...
More clean up freetype-related code
2015-11-07 20:21:55 -05:00
Benau
0b5a916980
Remove unused header
...
Also fix some spacing
2015-11-08 01:36:40 +08:00
Benau
09101e923c
More clean up freetype-related code
...
1. Remove useless get font properties class
2. Pre-set the face dpi
3. Make all freetype related code to have a better coding style
2015-11-07 16:24:31 +08:00
auriamg
c2d863888b
Merge pull request #2373 from Elderme/issue_2369
...
Fix issue 2369
2015-11-04 18:24:03 -05:00
Elderme
8d91ab5105
merge with master
2015-11-04 21:24:25 +01:00
Marianne Gagnon
78fd0e373f
#2360 fix attempt
2015-11-03 19:15:55 -05:00
auriamg
1cfbdd7c8c
Merge pull request #2371 from leyyin/clean-python
...
Make remove-whitespaces script more pythonic
2015-11-03 18:44:29 -05:00
rugk
d1e0564f8b
Merge pull request #4 from rugk/patch-2
...
Update INSTALL.md
2015-11-03 23:23:35 +01:00
rugk
b31464042d
Update INSTALL.md
...
* correct spaces
* proper names with a capital letter
* also use block code indentation for single-line commands to keep a consistent look (`this code style` should only be used for code/commands mentioned inside of other text)
2015-11-03 23:21:08 +01:00
rugk
ed0cf4ea34
Readme improvments
...
* added space afer `#` headline
* corrected file names of files I could find
* linked to files
However one thing I could not fix was this sentence:
"Information about the licenses for artwork are contained in
`data/licenses`."
The mentioned file or dir does not exist (anymore) and I could not find any other file, which would fit there.
2015-11-03 23:16:53 +01:00
Deve
795f3148dc
Revert "Added default precision qualifier in fragment shaders"
...
This reverts commit c23da9e855 .
2015-11-02 18:20:07 +01:00
Elderme
b70fa22d23
Define default precision in fragment shaders after #extension
2015-11-02 18:14:01 +01:00
Daniel Butum
faefad4fde
Make remove-whitespace script more pythonic
2015-11-02 16:35:59 +02:00
Daniel Butum
9df91ebd8a
Rename whitespace.py script to remove-whitespaces.py
2015-11-02 14:54:49 +02:00
auriamg
08e3a9ea13
Merge pull request #2367 from CruzR/memory_leaks
...
Fix a couple of memory leaks.
2015-11-01 20:15:16 -05:00
auriamg
9d456c5459
Merge pull request #2365 from Elderme/shader_precision
...
Add default precision qualifier in fragment shaders
2015-11-01 20:02:18 -05:00
Thomas Glamsch
a5a9b9f6c1
Fix a memory leak in PhysicalObject::init().
2015-11-02 01:43:54 +01:00
hiker
0d84239cd2
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-11-01 19:46:00 +11:00
auriamg
4762658a88
Merge pull request #2364 from Benau/freetype_cleanup
...
Clean up freetype code
2015-10-30 20:33:51 -04:00
Deve
8a288f05ff
Implement lightning effect using shaders
2015-10-31 01:00:48 +01:00
Elderme
c23da9e855
Added default precision qualifier in fragment shaders
2015-10-30 22:05:08 +01:00
Benau
41bd914f7c
Fix typo
2015-10-31 00:29:53 +08:00
Benau
b9b2b538fa
Clean up freetype code
...
1. Remove all ifdef of freetype
2. Require freetype in CMake
3. Clean up declaration
4. Add leak check
5. Make script language display better in title
2015-10-30 18:08:02 +08:00
Marianne Gagnon
66909086fd
Scripting : allow smoothly animating lights
2015-10-27 19:08:12 -04:00
Marianne Gagnon
953c29089e
Scripting : start adding features to control light objects
2015-10-27 18:33:54 -04:00
hiker
d2e6a10026
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-10-27 15:00:13 +11:00
hiker
c5b8c3e3e9
Try to improve performance for sfx ( #2154 ).
2015-10-27 14:59:20 +11:00
Marianne Gagnon
af68319da7
Add profiler marker to measure material handling in Kart::update
2015-10-25 21:22:45 -04:00
Marianne Gagnon
f9f9b660d3
Rename profiler marker to clarify what it measures
2015-10-25 21:21:05 -04:00
Marianne Gagnon
366a458a6b
Remove a few unused files, see #2066
2015-10-22 19:13:41 -04:00
hiker
b8cd9cfb81
Removed unused functions.
2015-10-22 23:41:49 +11:00
hiker
e6ae208b4f
Removed many unnecessary copies of NetworkString.
2015-10-22 21:43:06 +11:00
hiker
c59f958c2f
Removed unnecessary #include, and disabled copying of STKPeer.
2015-10-22 18:46:01 +11:00
hiker
a102d97e3a
Cosmetic changes, some minor refactoring.
2015-10-22 18:40:52 +11:00
hiker
1f4f2bce86
Coding style changes.
2015-10-22 16:03:11 +11:00
hiker
b8837d5d59
Coding style changes.
2015-10-22 14:54:12 +11:00
hiker
9b9fc2ee35
Fixed --no-graphics option.
2015-10-22 11:53:52 +11:00
hiker
4833659085
Added --stdout= command line option to change the name of
...
the stdout.log file.
2015-10-22 11:51:18 +11:00
hiker
65454db0ce
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-22 11:04:07 +11:00
hiker
6213959f31
Cosmetic/coding style changes.
2015-10-22 11:03:41 +11:00
Deve
8bfe048f0f
Remember race type in saved GP.
...
Continue standard race as follow the leader and vice versa doesn't have a sense.
2015-10-21 22:42:59 +02:00
Deve
4049722677
Don't crash if selection is larger than number of items in ribbon widget
2015-10-21 22:37:38 +02:00
hiker
25ca5646ff
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-22 00:03:11 +11:00
hiker
d6e7ddf000
Avoid copying STK Events for networking.
2015-10-22 00:02:40 +11:00
hiker
f297c92039
Removed more includes of event.hpp in hpp files.
2015-10-21 17:39:53 +11:00
hiker
841d9b248e
Removed some unnecessary #includes.
2015-10-21 17:31:33 +11:00
hiker
1a0fb9fa4c
Renamed notifyEvent to propagateEvent for the manager to avoid
...
'duplicated' name (notifyEvent also exists in each protocol).
2015-10-21 17:18:27 +11:00
hiker
cce4793fa3
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-21 08:43:32 +11:00
hiker
40629d9816
Changed Event's m_peer from STKPeer** to STKPeer *. Fixes some minor memory leaks.
2015-10-21 08:11:35 +11:00
hiker
814f248cbd
Fixed linux compilation.
2015-10-21 08:09:24 +11:00
hiker
9cdf7058a7
More coding style fixes.
2015-10-21 08:07:00 +11:00
hiker
94e87796f5
Coding style fixes.
2015-10-21 07:51:53 +11:00
Deve
054d9251bb
Don't sort karts after loading saved GP.
...
This causes issues in follow the leader races, because after sorting the leader is not leader anymore.
This sorting function is most probably not needed because the list is sorted in startNextRace function (where the leader is properly skipped).
2015-10-20 19:52:57 +02:00
Deve
4ac479cbf3
Merge pull request #2354 from hasufell/master
...
Fix compilation with system angelscript
2015-10-20 19:12:32 +02:00
hasufell
4e307522d1
Fix compilation with system angelscript
...
Upstream names the shared library angelscript_s.
In addition, add more common PATH_SUFFIXES.
2015-10-20 16:47:23 +02:00
hiker
54a0e50fe3
Try to fix linux compilation.
2015-10-21 00:18:51 +11:00
hiker
10c612a0f6
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-20 22:44:26 +11:00
hiker
0dfa05227e
Cosmetic changes mostly, removed unused functions.
2015-10-20 22:42:57 +11:00
Marianne Gagnon
cc7f7b9b4c
Use SigmarOne font for digits
2015-10-19 21:02:25 -04:00
Marianne Gagnon
9c3da791a4
Add Benau to credits, thank you :)
2015-10-19 20:56:38 -04:00
Marianne Gagnon
2dfc493adf
Minor FreeType cleanup
2015-10-19 19:25:51 -04:00
hiker
6fc4b9c19d
Prevent crash in case of issues creating the server.
2015-10-20 09:37:51 +11:00
hiker
46b4d275a9
Minor refactoring and coding style fixes.
2015-10-20 09:34:14 +11:00
Deve
0d58774b54
Fixed mingw compilation
2015-10-19 20:50:39 +02:00
hiker
d5a9364ece
Minor cosmetic changes.
2015-10-19 17:06:14 +11:00
hiker
3a544b69eb
Merge branch 'freetype_lazyloadchar' of github.com:supertuxkart/stk-code into freetype_lazyloadchar
2015-10-19 13:31:39 +11:00
hiker
52b5b7c8d1
Fixed crash caused by using a char pointer to a temporary string only (which can get
...
overwritten/freed before the pointer is used).
2015-10-19 13:29:52 +11:00
Marianne Gagnon
fcd402b538
Merge remote-tracking branch 'Benau/lazyloadchar' into freetype_lazyloadchar
2015-10-18 21:47:16 -04:00
Benau
109d6b91ce
Choose the correct title font smartly
2015-10-19 09:39:57 +08:00
Marianne Gagnon
06fb6d4eb2
Delete old fonts and related code
2015-10-18 20:15:05 -04:00
Marianne Gagnon
dd975de74f
Remove the font tool, which is no longer necessary
2015-10-18 20:10:31 -04:00
Marianne Gagnon
6d365032f3
A few minor bugfixes, a little cleanup in TTF font code. Add Ubuntu font for latin languages since it generally looks better than Freesans for a game
2015-10-18 20:07:11 -04:00
Marianne Gagnon
1a58df0696
Fix issue in language selection screen (improper utf-8 decoding)
2015-10-18 19:53:20 -04:00
Marianne Gagnon
0571db6bef
Freetpye support on OSX
2015-10-18 19:44:28 -04:00
hiker
8d0c22346d
Cosmetic changes only.
2015-10-19 08:15:43 +11:00
hiker
e535afc9d8
Cosmetic changes only.
2015-10-19 08:11:28 +11:00
hiker
faf697ef5d
Made access to the public address thread safe, and simplified setting
...
of the public address.
2015-10-19 08:02:44 +11:00
Benau
218f94d181
Silence warning
2015-10-18 10:10:03 +08:00
Marianne Gagnon
d0d6476feb
Merge remote-tracking branch 'Benau/lazyloadchar' into freetype_lazyloadchar
2015-10-17 21:41:56 -04:00
Benau
fad23b148b
Fix travis build
2015-10-18 09:40:37 +08:00
Marianne Gagnon
cee6d9d611
Merge branch 'master' into freetype_lazyloadchar
2015-10-17 21:34:19 -04:00
Marianne Gagnon
a84b04db66
Merge remote-tracking branch 'Benau/freetype' into freetype_lazyloadchar
2015-10-17 21:31:05 -04:00
Marianne Gagnon
f909619413
Add translation help comment, for issue #2335
2015-10-17 20:47:19 -04:00
Marianne Gagnon
fcfbd82a0e
Merge branch 'TranslatableDateTime'
2015-10-17 20:44:32 -04:00
Deve
e7e7e9e7d3
Make sure that we compile irrlicht only as static library.
...
Compiling as shared library can cause errors during linking because of GLContextDebugBit variable, which is defined in STK sources.
2015-10-17 16:02:35 +02:00
hiker
4fad614d55
Removed unnecessary copy constructor call, which makes the Synchronised
...
class work with NoCopy objects.
2015-10-17 09:33:05 +11:00
Ben
adbaa44864
Fix typo
2015-10-17 03:03:56 +08:00
Benau
d166aa620e
Add lazy load char function
...
Now less fonts are used to prevent mismatch, also include font license file
2015-10-17 02:57:27 +08:00
Benau
f557dce27e
Fix some bugs in title font and clean up more code
2015-10-17 01:20:50 +08:00
hiker
aeec90fa0d
Removed many unnecessary copies of TransportAddress.
2015-10-16 23:55:54 +11:00
Deve
9b5e4e9201
Merge pull request #2352 from leyyin/fix-compilation
...
Fix linux compilation
2015-10-16 10:43:10 +02:00
Daniel Butum
8cfa2f925a
Fix linux compilation
2015-10-16 11:22:20 +03:00
hiker
162bcced37
Make m_ip and m_port in TransportAddress private (adding setters and getters).
2015-10-16 16:59:42 +11:00
hiker
83811d2960
More compilation fixes :(
2015-10-16 10:37:20 +11:00
hiker
8183760cd9
Fix travis build.
2015-10-16 10:28:29 +11:00
hiker
aeb4ba63d0
Fixed #2350 .
2015-10-16 09:46:59 +11:00
hiker
517ba2c2df
Cosmetic changes, added some convenience functions.
2015-10-16 00:52:28 +11:00
hiker
9a55da5c2c
Reserve space for NetworkStrings (to reduce copying when reallocating).
2015-10-16 00:03:23 +11:00
hiker
e7860e1c14
Fixed compiler warnings.
2015-10-15 21:48:17 +11:00
hiker
a61506046b
Updated assets version.
2015-10-15 11:22:47 +11:00
Marianne Gagnon
0af8842767
Update translations
2015-10-14 19:52:36 -04:00
Ben
ee60eb9a68
Fix scoreboard display
2015-10-15 07:43:13 +08:00
samuncle
d80c7136e0
Add a better firework effect !
2015-10-14 02:34:23 +02:00
hiker
beca77e94f
Use NetworkString for stun response data.
2015-10-14 00:18:13 +11:00
hiker
192e2f99b5
Merge branch 'konstin-dev'
2015-10-13 22:09:11 +11:00
hiker
7356958774
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-13 21:12:22 +11:00
hiker
86574e4521
Added comments and further cosmetic changes. Removed some duplicated functions.
2015-10-13 20:53:53 +11:00
Benau
a756f9f90e
Better title font to all languages
...
I tested all language, all of the them only needs 2 glyph page
to load their needed chars.
2015-10-13 08:25:25 +08:00
Marianne Gagnon
a565c561e8
Scripting engine : add new getter Kart::getMaxSpeed
2015-10-12 19:59:17 -04:00
samuncle
4cf0b06d22
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-13 01:25:06 +02:00
samuncle
094d78e682
Minor change in gfx
2015-10-13 01:23:24 +02:00
Deve
407f29641c
Use ugly hack for compile bullet with 64-bit mingw until I will find better solution
2015-10-13 01:05:41 +02:00
Deve
375e7ea0ed
More fixes for 64-bit mingw
2015-10-13 01:05:41 +02:00
Deve
91db8620f8
Some work on support 64-bit windows compilation using mingw
2015-10-13 01:05:41 +02:00
hiker
3a023776fd
Minor style changes.
2015-10-13 09:19:40 +11:00
hiker
356588e09a
Merge branch 'dev' of https://github.com/konstin/stk-code into konstin-dev
2015-10-12 22:42:34 +11:00
hiker
45954e5881
Minor improvement.
2015-10-12 22:03:46 +11:00
hiker
c1d280eaa1
Cosmetic changes only.
2015-10-12 21:37:22 +11:00
Benau
786bc5d5b6
More detailed comments
2015-10-12 07:48:43 +08:00
Benau
f20158acd1
Merge remote-tracking branch 'mime/freetype_benau' into freetype
2015-10-12 07:38:25 +08:00
Benau
c7f20e549d
Revert widget changes
2015-10-12 07:33:09 +08:00
hiker
da73e7d9cf
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-12 10:07:04 +11:00
hiker
c0b7fec58a
Replaced another mutex with Sychronised.
2015-10-12 10:06:30 +11:00
hiker
47cb6ac2e3
Used Synchronised instead of pthread mutex.
2015-10-12 08:18:15 +11:00
hiker
124420b90a
Cosmetic changes only.
2015-10-12 08:02:20 +11:00
Benau
23e1f8fb3e
Default text wrapping in label widget
...
It should make no more text rendered out of area as stated in forum.
2015-10-12 01:48:13 +08:00
Benau
73ae81554d
Better size handling to specific languages
2015-10-12 01:14:47 +08:00
hiker
4b0d4cb853
Fixed typo in comment.
2015-10-11 21:23:39 +11:00
hiker
525cf6df62
Fixed incorrect name of stkgui file.
2015-10-11 21:22:58 +11:00
Marianne Gagnon
fbf158eaa4
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-10 20:52:18 -04:00
Marianne Gagnon
d63837260f
Remove seemingly uneeded rotation, see #2345 . Not sure I understand what is going on
2015-10-10 20:52:12 -04:00
Deve
debb238b35
Use '3' graphical level when STK is run first time instead of custom settings.
...
Degraded_IBL parameter was probably accidentally set to false because option in settings means "enable IBL if true", but variable means "disable IBL if true".
2015-10-10 16:04:33 +02:00
Benau
9fe84d3dd4
More code clean up with doxygen for freetype related file
2015-10-10 16:20:33 +08:00
hiker
f0c04a8bef
Started to support LAN servers in the GUI (wip).
2015-10-10 12:13:32 +11:00
Marianne Gagnon
e4095c03a3
Fix material manager issue
2015-10-09 19:46:53 -04:00
hiker
612ec37dbd
Updated credits.
2015-10-10 10:36:50 +11:00
Benau
a7b2c8838f
Try to fix the edged font when changing resolution
...
I add a debug function to write the glyph page png(s) too.
2015-10-10 01:59:29 +08:00
hiker
73cf58d13b
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-10 00:19:44 +11:00
Deve
500cbe2ebf
Allow to use 1280x720 resolution.
...
This is quite popular resolution and it is a kind of standard. Even the most of new monitors have it because it has the same porportion as 1920x1080. And it looks much better than 1024x768 expanded to 16:9 proportionos ;) I also didn't notice any issues in gui during using it.
2015-10-09 13:47:19 +02:00
hiker
a66af6dc91
Cosmetic changes for coding style.
2015-10-09 16:47:18 +11:00
hiker
42ea2e5819
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-09 12:53:27 +11:00
hiker
4d181d3358
Make icons visible if login status is changed.
2015-10-09 12:52:49 +11:00
Marianne Gagnon
e1a6478038
Forgotten file in previous commit
2015-10-08 21:35:18 -04:00
Marianne Gagnon
7c5d6711b9
Introduce new mechanic to create keyboard shortcuts for debug functions, and start using it for FPS camera. Fixes #2341
2015-10-08 20:06:42 -04:00
hiker
92f18d03dc
Removed unnecessary variable.
2015-10-09 09:43:50 +11:00
hiker
d687d17bfe
Added (atm not working) LAN server menu entries.
2015-10-09 09:36:08 +11:00
Benau
486495d976
More code clean up
...
Now all freetype related file are written in c++ class, which enable
better coding style with current stk
Windows build tested, the edge showing issue doesn't happen on Windows btw
Maybe driver problems?
2015-10-09 01:59:22 +08:00
Benau
ebeca35460
First version of glyph page loading supporting for freetype stk
...
Performance should be good, it cleans some unused code too.
Windows build not tested.
2015-10-08 16:41:31 +08:00
hiker
917905c779
Removed unused functions.
2015-10-08 16:28:23 +11:00
hiker
00e7c35484
Match one more .stkgui and .cpp file name.
2015-10-07 16:37:42 +11:00
hiker
d391727879
Match more .stkgui and .cpp file names.
2015-10-07 16:33:01 +11:00
hiker
a49fdca521
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-07 13:16:02 +11:00
hiker
3aadc019a3
Made more .stkgui name correspond to the c++ file name.
2015-10-07 12:33:36 +11:00
hiker
14e84ed96b
Minor style changes.
2015-10-07 08:22:02 +11:00
hiker
ccf8fd4e68
Renamed stkgui so that .cpp and .stkgui file names are identical.
2015-10-07 08:11:57 +11:00
Deve
2a12fa51ed
Merge pull request #2337 from Elderme/fix_2328
...
Fix global illumination bug with intel driver #2328
2015-10-06 12:18:57 +02:00
Benau
1e7e895d7f
Fix build and code clean up
...
Now billboard text should have a better alignment
2015-10-06 16:14:32 +08:00
Marianne Gagnon
ca107bf159
Translatable DateTime (see #2335 )
2015-10-05 19:36:39 -04:00
Marianne Gagnon
d47faaaa89
Fix billboard text
2015-10-05 19:22:08 -04:00
Elderme
0fc3d3336e
removed useless varying in rhpassthrough.geom shader
2015-10-05 21:22:22 +02:00
Deve
6318e8c8f8
Fixed compiler warnings
2015-10-04 16:54:14 +02:00
Benau
3a5ec83ae9
Basic render of text using freetype
...
This is a testing version of stk using freetype
It enable better arabic font display with less blurred glyph to all fonts thanks to hinting provide by freetype.
TODO: billboard text
2015-10-04 11:59:44 +08:00
Deve
ec33e92ad0
Forgot about sun
2015-10-03 21:12:41 +02:00
Deve
bac60ff126
Fixed crash on exit race with OpenGL 2.1
2015-10-03 21:06:32 +02:00
Deve
895579cba9
Fixed starting a race on OpenGL 2.1
2015-10-03 17:02:49 +02:00
Deve
e15cd49cae
Make changing to fullscreen on linux safer.
...
Now we are waiting until window state is already changed to fullscreen. We are getting real window size at the end of creating window function and previously it was sometimes reporting size of the window in windowed mode, which could causing issues in gui. Previously this was workarounded by forcing minimal window size to be at least in screen resolution, but window managers don't like to have non-resizeable fullscreen windows. Now this workaround is not needed anymore.
2015-10-03 16:43:22 +02:00
Marianne Gagnon
9e6cf8ee91
Fix buggy RTL detection, see #2320
2015-10-01 19:55:41 -04:00
samuncle
71069752ba
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-09-29 20:09:55 +02:00
samuncle
26298e9e1a
Add several new particle effect and correct the bug to enable emit map & alpha testing
2015-09-29 20:08:56 +02:00
hiker
259be4c3fe
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-09-29 09:27:30 +10:00
Joerg Henrichs
4791731946
Moved update_po_authors to data/po so that we don't forget it.
2015-09-29 08:45:50 +10:00
hiker
8e3b8742df
Used smaller picture for installer (the previous one was never actually used).
2015-09-29 08:01:57 +10:00
hiker
449e754849
Fixed #2327 .
2015-09-29 07:58:24 +10:00
Joerg Henrichs
898e4c3fc7
Updated asset revision number used for the 0.9 and 0.9.1-rc1 releases.
2015-09-28 11:52:43 +10:00
hiker
344912ac2a
Updated Asian fonts.
2015-09-28 10:14:20 +10:00
hiker
63967b8a21
Fixed typo in credits.
2015-09-28 10:00:02 +10:00
Marianne Gagnon
31875565bb
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-09-27 19:41:30 -04:00
Marianne Gagnon
27be1b9013
update translations
2015-09-27 19:40:16 -04:00
hiker
3c35c15581
Updatex changelog.
2015-09-28 09:35:47 +10:00
hiker
8d45d689b7
Updated donations.
2015-09-28 09:21:30 +10:00
hiker
0e90042a0d
Fixed incorrect handling of 0x1a character in credit files
...
(which can happen in unicode, previously stk would stop
reading files after 0x1a).
2015-09-28 09:12:45 +10:00
hiker
f543ba4f7b
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-09-28 09:11:20 +10:00
Deve
11f6084fc5
Fixed crash on exit and changing resolution with old opengl.
...
Regression introduced in commit 93f24f2a74 .
Playing the real game is still not working.
2015-09-27 14:18:09 +02:00
hiker
cfbd960129
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-09-27 11:18:10 +10:00
Deve
f351c359fd
Create angelscript library in build directory instead of lib directory.
...
This solves issues with multiple build directories (every one should have its own angelscript lib). It was causing conflicts eg. 32-bit library with 64-bit STK.
Ideally it should be commited upstream to avoid this problem after updating library.
2015-09-26 23:02:18 +02:00
Deve
07b0ab0d78
Fixed disabling "remember window pos" button when fullscreen is enabled.
...
Regression since commit 9b562d31f4
2015-09-26 20:40:10 +02:00
Deve
35fa7fd272
Fixed a strange bug during changing window to fullscreen under Gnome
2015-09-26 20:32:55 +02:00
Marianne Gagnon
870a5fad3e
Update credits in master too
2015-09-25 20:44:27 -04:00
hiker
642a333e5e
Fixed kart getting stuck at doors of overworld (and other static
...
physical objects).
2015-09-26 01:08:10 +10:00
hiker
e97c4858f3
Updated supertuxkart.pot to be not sorted (see pull #2319 ).
2015-09-26 00:21:16 +10:00
hiker
165ea3d87e
Merge pull request #2319 from huftis/removestringsorting2
...
Don’t sort strings alphabetically (again)
2015-09-25 23:34:55 +10:00
Karl Ove Hufthammer
96cde24615
(Again) don’t sort strings alphabetically (makes the translators’ work much easier).
2015-09-25 10:51:31 +02:00
hiker
fc67252e78
Fix #2300 (mostly,karts get stuck there atm, but can't drive through the door).
2015-09-25 09:15:47 +10:00
hiker
b7837fd05c
Fixed compiler warnings.
2015-09-21 07:44:00 +10:00
hiker
9e0a90f634
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-09-20 20:20:16 +10:00
auriamg
5d9805b8ab
Merge pull request #2317 from MiroslavR/fix-supertux-btn
...
Fix SuperTux difficulty button state not updating correctly
2015-09-18 18:53:07 -04:00
MiroslavR
ccf9cee2ff
Fix SuperTux difficulty button state not updating correctly
2015-09-18 20:48:18 +02:00
hiker
125bc1fc8f
Renamed'lazy' loading in material (which is used to not load font
...
textures sinze they are not all needed) to 'dont_load' - so that
'lazy' can be used for lazy loading (i.e. on demand, but still
by the material, not by an external object) of textures.
2015-09-18 09:51:52 +10:00
Marianne Gagnon
b3e2924df0
Fix opening wrong friend profile due to sorting, fixes #2313
2015-09-14 19:04:54 -04:00
Marianne Gagnon
b9183dde21
Bugfix : no music when losing GP, see #2296
2015-09-12 19:54:40 -04:00
Marianne Gagnon
4c09d459cb
Fix gamepad visualisation mode by request a legacy openGL context. Temporary fix, the proper long-term fix will be to rewrite that screen with modern OpenGL. See #2098
2015-09-12 19:44:58 -04:00
Marianne Gagnon
87ebb00d7d
Tweak mathclass challenge
2015-09-12 19:42:36 -04:00
Deve
6af30b68f0
Silence angelscript warning in different way.
...
We can't remove project() line because it uses ${PROJECT_SOURCE_DIR} in other place.
2015-09-12 21:56:49 +02:00
Deve
e47be9b283
Update .pot file
2015-09-08 20:13:29 +02:00
Deve
fce90c56f6
Add context for key names translations.
...
At least in some languages most of key names is non-translatable. But some of these names are used (or can be used) in GUI in different places. For example "Play", "Pause", "End" etc...
At this moment probably the only one key name which is used in other places is "Help". But we will be safe in future.
2015-09-08 20:13:29 +02:00
Marianne Gagnon
9f15659a77
Tweak challenge, fixed #2156
2015-09-07 18:02:11 -04:00
auriamg
58b896d599
Merge pull request #2310 from MiroslavR/l10n
...
Add 'Ť', 'Ý' and 'Ľ' glyphs to the title font
2015-09-07 17:42:17 -04:00
Deve
5d660e8e23
Merge pull request #2280 from temeliak/fix_2232
...
Offers the possibility to look backward during the start phase. #2232
2015-09-07 18:54:57 +02:00
Deve
27a2f1bdc1
Silence warning about project version in angelscript.
...
I still didn't find proper solution for it...
2015-09-07 18:19:42 +02:00
Deve
bfa92bc339
Don't complain about angelscript library not found in system
2015-09-07 18:14:57 +02:00
MiroslavR
517f493ca3
Add 'Ť', 'Ý' and 'Ľ' glyphs to the title font
2015-09-06 22:26:00 +02:00
Deve
bd49fa4fd8
Move adding definition to other definitions
2015-09-06 21:00:50 +02:00
Deve
c124f5f371
Remove unused code from cmake.
...
We are using now two different repositories (svn and git), and still creating the package without attached libraries doesn't have a sense.
2015-09-06 20:58:12 +02:00
Deve
4498870cb8
Merge pull request #2271 from konstin/network_cmake
...
Allow enabeling Network Multiplayer through CMake flags
2015-09-06 20:33:10 +02:00
auriamg
b64de23b06
Merge pull request #2307 from Benau/master
...
Fix typo and and add quotation
2015-09-03 18:49:48 -04:00
Ben
c488e843b8
Fix typo and and add quotation
...
The quotation added is for Chinese Simplified which I discovered usage in translation work.
2015-09-03 16:30:22 +08:00
Marianne Gagnon
65a7b5bf04
Fix lights in multiplayer, fixes #2305
2015-09-02 18:30:55 -04:00
Deve
8a42fab5f1
Declare HAVE_STRUCT_TIMESPEC also for future Visual Studio versions
2015-09-02 17:41:44 +02:00
Marianne Gagnon
e2da2a36a1
Fix line endings
2015-09-01 19:39:30 -04:00
Marianne Gagnon
5c342290b0
Fix corrupted text in GP editor
2015-09-01 19:39:21 -04:00
auriamg
f788ae0f3a
Merge pull request #2301 from Benau/master
...
Fix the ugly hack for displaying Chinese in #2110 , and then fix #2297
2015-09-01 19:34:03 -04:00
hiker
94d8706504
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-09-01 10:28:56 +10:00
Marianne Gagnon
9a6b41d2b5
Apply offset on meshes with exact collision shape, fixes #2300
2015-08-31 19:57:55 -04:00
hiker
426987045c
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-09-01 09:49:04 +10:00
hiker
d6319f77d5
Fix #2299 (audio issues in minigolf end): the listener position was
...
not set at all anymore when an end camera was used.
2015-09-01 09:43:01 +10:00
Marianne Gagnon
90b95c7fb5
Make sure there is music when winning a GP, fixes #2296
2015-08-31 19:33:05 -04:00
hiker
da848a4c72
Accept --difficulty as well as --mode.
2015-08-31 17:09:51 +10:00
Benau
0a7a0d7c98
Fix the ugly hack for displaying Chinese in #2110 , and then fix #2297
2015-08-30 02:35:17 +08:00
Marianne Gagnon
0a1053b3e4
Update translations, remove unused GUI file that generated unused strings
2015-08-28 20:09:06 -04:00
hiker
267e6963c2
Fixed #2294 (crash when kart is off road and not on material).
2015-08-26 17:15:59 +10:00
Marianne Gagnon
77098c9e7c
Tweak subsea challenge
2015-08-25 21:28:49 -04:00
Marianne Gagnon
63ab79ff8d
Fix string on GP result screen, fixes #2295
2015-08-25 21:28:09 -04:00
Marianne Gagnon
0cce586c87
Fix animated physics-only objects. Fixes #2292
2015-08-25 19:14:10 -04:00
Marianne Gagnon
64b4b7a2f2
Don't try to navigate to another screen when a dialog is open, fixes #2265
2015-08-24 18:56:50 -04:00
hiker
e6ad28cc81
Fixed #2097 (allow friends to be sorted).
2015-08-24 08:09:32 +10:00
hiker
64af720833
Fix #2157 (FTL challenge in overworld showed number of laps).
2015-08-23 01:15:04 +10:00
hiker
1aa229287b
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-08-22 11:40:00 +10:00
hiker
ee33c46797
Fixed #2183 (bomb hands moving backwards).
2015-08-22 11:36:40 +10:00
Marianne Gagnon
ca384dc870
More font improvements for #2121
2015-08-21 19:39:01 -04:00
Marianne Gagnon
82ad06052d
Add missing font char, see #2121
2015-08-21 19:35:14 -04:00
hiker
309097b0db
Fixed #2151 (by disabling 800x600 resolution, except in artist debug mode).
2015-08-20 11:03:46 +10:00
hiker
aff41a25b5
Disabled AI debug, which was left enabled by mistake - sorry :)
2015-08-19 13:07:13 +10:00
hiker
6139d689d7
Fix #2176 - rank jump on Northern Resort: this was fixed by not
...
adjusting the distance a kart has travelled on the road if the
kart is flying and over a reset texture (previously stk would fine
a quad way ahead of the kart, and a much greater distance along
track, which caused the kart to be ahead for a few frames, before
it was rescued and reset to its original position).
2015-08-19 13:05:01 +10:00
Marianne Gagnon
35b15a9e7a
Fixed corrupted text introduce with recent change of how translations are handled
2015-08-18 19:08:23 -04:00
Marianne Gagnon
b92a479ac1
Merge remote-tracking branch 'temeliak/fix_2182'
2015-08-18 18:40:05 -04:00
hiker
8aeb16221a
Fixed displaying of debug spheres in GLSL pipeline.
2015-08-18 23:50:55 +10:00
hiker
f8f0c4e4e4
Fixed compiler warning.
2015-08-18 16:54:55 +10:00
hiker
2330624ccb
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-08-18 16:37:49 +10:00
hiker
cf464f1ed8
Fixed various crashes when enabling AI debug (e.g. missing textures,
...
heap corruption because the hpp file did not know about AI_DEBUG
and so did not declare some variables).
2015-08-18 10:30:42 +10:00
auriamg
6a26010bc8
Merge pull request #2106 from Flakebi/test
...
Simplify StringUtils::insertValues
2015-08-16 19:48:05 -04:00
Flakebi
65c15fc19a
Add a check to split for non-wide strings too
2015-08-17 01:32:13 +02:00
Flakebi
eef55b04f8
Fix the merge
2015-08-17 00:31:55 +02:00
Flakebi
80a649fc2d
Merge branch 'master' into test
...
Conflicts:
src/utils/string_utils.hpp
src/utils/translation.cpp
2015-08-17 00:22:02 +02:00
Flakebi
97891f25f7
Fix something
2015-08-17 00:03:29 +02:00
Flakebi
c07f806afb
Use a map instead of a vbector
2015-08-16 22:24:07 +02:00
Flakebi
8c09228b39
Remove underscores and add a comment
2015-08-16 21:05:52 +02:00
konstin
c78abbddf7
try to fix travis CI compilation
2015-08-15 15:10:30 +02:00
konstin
1eb3b6f74e
More small improvements
2015-08-15 15:04:31 +02:00
konstin
d9697cbbe0
order functions chronologically
2015-08-15 15:04:31 +02:00
konstin
a4fa65673e
huge amount of small improvements, most thanks to leyyin
2015-08-15 15:04:31 +02:00
konstin
1ce3be98ee
Move the STUN request creating and sending from GetPublicAddress::asynchronousUpdate() into its own function
2015-08-15 15:04:30 +02:00
konstin
5ec9fa38ab
Implement a consistent error managing for GetPublicAddress::asynchronousUpdate() by moving the STUN response parsing into its own function
2015-08-15 15:04:30 +02:00
konstin
ee06cd3ba2
Improve readability and add documentation for GetPublicAddress::asynchronousUpdate()
2015-08-15 15:04:29 +02:00
hiker
e97b0a9955
Avoid crash when using --check-debug (still wip).
2015-08-14 23:14:19 +10:00
hiker
fa1ed0240f
Fix #2270 (crash on startup).
2015-08-14 16:50:37 +10:00
hiker
ce17da98bf
Merge branch 'Elderme-Fix_particles'
2015-08-14 13:51:53 +10:00
Elderme
392a7c3203
Merge branch 'master' into Fix_particles
2015-08-13 18:25:18 +02:00
Elderme
0b748634ae
Removed calls to resizeBox for nitro emitter
2015-08-13 18:15:34 +02:00
Elderme
01c8b25cb6
When the particles position is computed, the position of the emitter in both current and previous frames is now taken into account. There is no more visual artifact when the particles velocity and emitter velocity are not aligned (for example with nitro particles when a kart is skidding)
2015-08-13 14:53:45 +02:00
hiker
3a0f2e7ce5
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-08-13 13:49:31 +10:00
hiker
567d08d360
Visualise invisible physics-only meshes when --physics-debug is
...
specified (helps debugging invisible walls).
2015-08-13 09:51:45 +10:00
auriamg
00ef94b2b9
Merge pull request #2284 from torso/master
...
Check size of window; don't assume it equals requested size
2015-08-12 18:03:32 -04:00
Torbjörn Söderstedt
bc4e532510
Use actual screen size when fading cutscenes.
2015-08-12 22:54:42 +02:00
Deve
63249309c3
Fixed compiler warning.
...
Previously address of local variable was returned.
2015-08-12 19:23:38 +02:00
Deve
7a4112e89c
Fixed compiler warning.
...
Based on fread specification, it returns number of elements which has been read.
Here is declared one element with size of whole file (len), so returned value should be always equal to 1.
2015-08-12 18:37:31 +02:00
temeliak
eb2b5c400f
Adding spaces to improve readability
2015-08-12 12:03:07 +01:00
temeliak
5616e791cb
Adding space in if statements to make them more readable.
2015-08-12 11:55:51 +01:00
Marianne Gagnon
7b8da0ef34
Bugfix : objects with a physics collision from a library should rotate and scale according to the parent library object
2015-08-11 20:55:04 -04:00
temeliak
a07029a365
Added SFX to nitro
2015-08-12 00:50:35 +01:00
Marianne Gagnon
ea9520863d
Try to correct string encoding issue in scripting. Fixes #2278
2015-08-11 19:30:20 -04:00
temeliak
0b60d4e9f6
Offer the possibility to look backward during the start phase.
2015-08-11 02:39:25 +01:00
Marianne Gagnon
70799539a6
Add graphical level preset between 4 and 5, the difference between the 2 was a little too steep
2015-08-10 19:04:35 -04:00
Marianne Gagnon
6529381acd
Fix rescue code in tutorial mode, fixes #2279
2015-08-10 19:01:58 -04:00
Marianne Gagnon
bc67f4f503
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-08-09 21:40:05 -04:00
Marianne Gagnon
d488c043d1
Continue work on scripting, fixing #2268 . Use this as an opportunity to clean up a lot of old hardcoded overworld code, and replace it with cleaner scripting. Make sure to update SVN and the exporter (other commits in SVN coming soon)
2015-08-09 21:38:01 -04:00
Deve
fe1222c5cc
Don't add tracks in reversed mode when it's not available.
...
This fixes #2158 .
2015-08-09 20:52:12 +02:00
Deve
78cd8efdd4
Reset screensaver counter on linux when joystick event was received
2015-08-09 18:54:59 +02:00
Deve
7ae541e638
Reload selected GP after changing the name.
...
This fixes #2159
2015-08-09 13:12:20 +02:00
konstin
25082f2fbc
Add description
2015-08-08 14:31:32 +02:00
konstin
c79c51e6c7
allow enabeling Network Multiplayer through CMake flags
2015-08-08 14:29:14 +02:00
Marianne Gagnon
43d5dbeb3e
Implement setEnabled method for sound track objects, fixes warnings on terminal and fixes hiding objects containing sounds from scripting
2015-08-07 18:26:37 -04:00
Elderme
5b353a8921
Cleaned code in irr_driver.hpp
2015-08-07 15:32:13 +02:00
Elderme
ae5f71e50e
Merge branch 'master' into skybox_refactoring
2015-08-07 15:12:56 +02:00
Elderme
87b493aaa2
Cleaned code
2015-08-07 15:11:32 +02:00
Elderme
f583fafd97
Fixed bug (SH textures were not taken into account)
2015-08-07 14:26:38 +02:00
Elderme
30ecf34b37
Spherical harmonics coefficients are no longer recomputed when the ambient light do not change
2015-08-07 13:50:44 +02:00
Marianne Gagnon
518a55d1e3
Fix quad requirements issue causing rescues to wrong quad
2015-08-06 20:24:20 -04:00
Marianne Gagnon
fac5d6550b
Fix use-after-free bug in profile management
2015-08-06 19:40:41 -04:00
Deve
a3abb57480
Build wiiuse on VS2015
2015-08-06 19:57:22 +02:00
Elderme
351be306e1
Fixed memory leak: skybox textures are now freed in VRAM when deleting Skybox
2015-08-06 14:58:45 +02:00
Elderme
9ea3d4958a
Improved coding style and added doxygen comments in ShericalHarmonics class
2015-08-06 14:47:38 +02:00
deve
b5c15275de
Fixed compiler warning.
...
This is already fixed upstream in commit r2174:
"Fixed compiler warnings in asGetTypeTraits on gnuc 5.1"
2015-08-06 14:35:26 +02:00
deve
5458792b79
Disable deprecated and unused irrlicht function to avoid compiler warnings
2015-08-06 13:54:40 +02:00
deve
e1f61040e5
Use unique_ptr instead of auto_ptr
2015-08-06 13:54:29 +02:00
deve
75c1f02615
Restore using unique_ptr instead of auto_ptr in tinygettext.
...
It fixes compiler warnings on gcc 5.1 due to auto_ptr deprecation. It also makes our tinygettext fork closer to the upstream sources. And we use c++11 in other places anyway.
2015-08-06 13:54:11 +02:00
deve
2e1045f717
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-08-06 10:03:07 +02:00
deve
a0e54bb0b8
Avoid timespec structure redeclaration on VS2015.
...
Still seems to be a bit messy, because in newer pthread header (gcc 5.1) I see _TIMESPEC_DEFINED instead of HAVE_STRUCT_TIMESPEC. But it should work with our dependencies files.
And still wiiuse library needs to be recompiled to make it working with VS2015.
2015-08-06 10:00:08 +02:00
hiker
52e8df44fd
Fixed compiler warning.
2015-08-06 16:47:41 +10:00
hiker
a19119a2f2
Merge remote-tracking branch 'origin/master' into lensdust
2015-08-06 16:40:00 +10:00
hiker
43c12c1a1e
Fixed slightly outdated documentation.
2015-08-05 20:57:27 +10:00
Elderme
0b479a8bb0
Moved spherical harmonics things from IBL.cpp to ShericalHarmonics class
2015-08-05 11:13:25 +02:00
hiker
41f744baf3
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-08-05 17:02:55 +10:00
hiker
b44f0605dc
Try to bring karts quicker back on the ground when the kart is
...
on its side, without overcompensating (and therefore shaking)
when the kart is only slightly non-parallel to the ground
when flying.
2015-08-05 17:00:40 +10:00
Marianne Gagnon
c2feb458af
When restoring ribbon selection, consider that maybe the ribbon does not anymore contain as many items as previously. Fixes #2260
2015-08-04 19:31:38 -04:00
Marianne Gagnon
bd85f51779
Improve memory management in GP manager, fixes #2261
2015-08-04 19:26:12 -04:00
hiker
f36672c104
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-08-05 08:16:10 +10:00
hiker
9e75d28eeb
Write the reverse flag into history files.
2015-08-05 08:15:31 +10:00
hiker
93a5a91628
Fix #2152 (star effect not showing in graphics level 1).
2015-08-05 08:07:58 +10:00
hiker
ba07515b4f
Merge pull request #2259 from konstin/master
...
remove patch file
2015-08-04 19:37:37 +10:00
konstin
cdfa571855
remove patch file
2015-08-04 11:15:29 +02:00
Elderme
c3f77a3b72
Fixed kart selection screen rendering (ambient light was broken)
2015-08-04 10:49:39 +02:00
hiker
4f4a1c0373
Added support for reverse mode in history files.
2015-08-04 17:14:36 +10:00
hiker
2a56cc6241
Fix 2192 (key names like "Left" are not translatable).
2015-08-04 09:45:38 +10:00
hiker
340dec329c
Support to mirror a texture around U or V axis if a track is driven
...
in reverse.
2015-08-03 23:25:11 +10:00
hiker
6f11156c04
Fixed crash if a player kart in a saved GP is deleted.
2015-08-03 22:02:13 +10:00
Elderme
53b6ab0a48
Moved specular probe computations from IBL files to Skybox class
2015-08-03 11:35:51 +02:00
hiker
8d0cad3cb8
Use proper call instead of hard coded constant.
2015-08-03 15:44:44 +10:00
hiker
a852cf94fb
Don't save random GPs (which can not be continued anyway), and allow only
...
one saved data set (for each GP and difficulty). Previously saved 'random'
GPs (which can't be continued anyway) are deleted now, cleaning up the
config.xml file.
2015-08-03 15:10:36 +10:00
hiker
085627364c
Fix #2162 (switch kart when loading a GP).
2015-08-03 07:53:21 +10:00
Elderme
6fc28b5d7c
Removed render_skybox.cpp file
2015-08-02 23:07:05 +02:00
Elderme
3a50a4d5d2
Moved remaining spherical harmonic things from render_skybox.cpp to SphericalHarmonic class
2015-08-02 23:01:52 +02:00
Elderme
2817fda910
Merge branch 'master' into skybox_refactoring
2015-08-02 00:09:10 +02:00
Elderme
a8b16bb1d4
Fixed bug in tracks without skybox
2015-08-01 23:45:46 +02:00
hiker
2f902f769d
Fixed minor memory leak.
2015-08-01 22:02:00 +10:00
hiker
78c592e4e5
Added a file with a 'unique filename' with version number which is used by STK
...
to detect that stk is reading the right data files (and therefore avoids #2073 ,
in which stk finds the wrong data directory).
2015-07-31 22:06:21 +10:00
hiker
b6165ce5f5
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-31 16:51:27 +10:00
hiker
a81366c414
Removed rescue-code duplication in battle mode and soccer mode.
2015-07-31 16:27:52 +10:00
hiker
431853b451
Removed some unused code, added better error message in case
...
stk_config.xml could not be found.
2015-07-31 15:45:25 +10:00
auriamg
7fbfad664a
Merge pull request #2228 from tobbi/misc_coverity
...
Fix a couple of deref after NULL check in states_screens
2015-07-30 19:21:46 -04:00
hiker
9557ad9be9
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-31 07:51:23 +10:00
hiker
25c1880c18
Fixed rescue in soccer mode (which would previously used World's
...
moveKartAfterRescue, not its own custom function).
2015-07-31 07:49:54 +10:00
Tobias Markus
a9761e30da
Fix various issues reported by coverity
2015-07-30 18:46:01 +02:00
Elderme
8642e14bc3
Removed m_diffuse_coefficients_calculated attribute in RTT (diffuse coefficients are now managed in SphericalHarmonic class)
2015-07-30 17:51:42 +02:00
hiker
bf858dd3ff
Fixed compiler warning.
2015-07-30 17:14:18 +10:00
hiker
7799e9835d
Added a getStartTransform function to World. Use this to change
...
the start position of the non-leader karts in a FTL race, so that
those karts now start at the end of all start positions, and not
directly behind the leader.
2015-07-30 17:12:48 +10:00
Elderme
133f8d5966
solved conflicts
2015-07-30 08:29:28 +02:00
Elderme
39d1c87b11
Fixed incorrect rendering when there is no spherical harmonic textures
2015-07-30 08:14:57 +02:00
Elderme
97ed8b2dbf
splitted skybox class in Skybox and SphericalHarmonic classes
2015-07-30 08:14:57 +02:00
Elderme
3640e4a69a
Move skybox things from irr_driver to Skybox class.
2015-07-30 08:14:57 +02:00
Elderme
cf40c402ba
Add a Skybox class
2015-07-30 08:14:57 +02:00
Marianne Gagnon
738e7bc780
Fix inverted if condition in input options screen, fixes #2255
2015-07-29 18:55:40 -04:00
Marianne Gagnon
3687eb79d6
Apply modified version of patch from Benau to fix chinese word wrapping. See #2110
2015-07-29 18:51:03 -04:00
hiker
75b49b4d4f
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-29 17:29:45 +10:00
hiker
b18d0275fd
Display a finish (survival) time in FTL result screen.
2015-07-29 17:27:43 +10:00
Marianne Gagnon
280ddf967d
Add missing character to the font, fixes #2226
2015-07-28 19:17:37 -04:00
hiker
d27ba5f6fe
Fix #2249 (show points and points increasing in a FTL GP).
2015-07-29 08:58:42 +10:00
hiker
6ada5a0666
Revert "Properly ignore the leader in the ftl scoreboard"
...
(this patch only fixed the problem that happens when a non-leader
is number one. By now the code has fixed that it is guaranteed
that the leader is always number one, so this patch is not
necessary anymore, and it complicates the loop).
This reverts commit e9d78326fb .
Conflicts:
src/states_screens/race_result_gui.cpp
2015-07-29 08:12:23 +10:00
hiker
3f468b254c
Removed unused/duplicated code, use World::setKartPosition instead
...
of Kart::setPosition (since this will keep an index array up-to-date).
2015-07-29 07:59:46 +10:00
hiker
8dbaea6456
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-28 09:40:27 +10:00
hiker
5efb44a430
Fixed scores in FTL GPs. All score handling is now done by the World,
...
not race manager (which removes if tests).
2015-07-28 09:39:00 +10:00
hiker
5c66273712
Fixed compiler warning.
2015-07-27 16:41:46 +10:00
samuncle
9087d0f837
Increase the strenght of the lens dust
2015-07-27 02:00:34 +02:00
hiker
95b86ea914
Fixed #2247 .
2015-07-27 09:56:58 +10:00
auriamg
35949b198a
Merge pull request #2252 from tobbi/fix_story_mode_crash
...
Fix crash when loading story mode
2015-07-26 19:06:20 -04:00
Marianne Gagnon
51fe38f76e
Use <cmath> instead of <math.h>, apparently fixes OSX compilation. Closes #2253
2015-07-26 19:05:05 -04:00
auriamg
df1bb8b3dd
Merge pull request #1956 from Flakebi/feature
...
Use camera position for LoD instead of the kart position, fixes #1742
2015-07-26 18:54:22 -04:00
Tobias Markus
fcc3e75a99
Fix crash when loading story mode
2015-07-26 16:41:36 +02:00
samuncle
1ca6339589
Add color to the lens dust
2015-07-26 05:30:29 +02:00
samuncle
51bd87d303
ground work for lens dust
2015-07-26 04:48:29 +02:00
Marianne Gagnon
4356dfde0c
Document missing command-line option, fixes #2095
2015-07-25 20:06:42 -04:00
Marianne Gagnon
a268354ac9
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-07-25 19:55:55 -04:00
Marianne Gagnon
e0dd736a7c
Main menu : prevent text on mouse over from overflowing the bounds of the screen. FIxes #2163
2015-07-25 19:55:17 -04:00
samuncle
d95f9d844d
put into comment the blue lens flare if we need in the future
2015-07-26 01:51:28 +02:00
samuncle
1ec0c18d5a
Change the fov (hiker you can still tweak or make an option
2015-07-26 01:49:29 +02:00
samuncle
33a60ae8d5
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-07-26 01:46:50 +02:00
samuncle
12b1ea5a6c
Turn on color for lens flare
2015-07-26 01:46:19 +02:00
hiker
d9e806f610
Changed unsigned int to int (dest_pos can become negative, and
...
while de-facto it still works with unsigned, it's just bad style :) ).
2015-07-26 00:32:11 +10:00
hiker
a9aa37ea97
Minor code style fixes.
2015-07-26 00:31:15 +10:00
hiker
c8909b9197
Fixed missing display of points for non-winners in a FTL GP (partly fix
...
for #2249 ).
2015-07-26 00:30:09 +10:00
hiker
cd256061e1
Fix #2248 (crash when taking screenshot). The assert was not appropriate
...
(avoiding the call to clearAllMessages would have been quite ugly).
2015-07-26 00:26:43 +10:00
hiker
76a779fc1c
Merge branch 'ftl-scoreboard' of https://github.com/Flakebi/stk-code into Flakebi-ftl-scoreboard
2015-07-25 12:17:02 +10:00
hiker
622d0821cf
Fixed rescue (which my previous commit broke).
2015-07-24 21:38:35 +10:00
hiker
6345272727
Removed unnecessary #include in kart.hpp.
2015-07-24 16:51:03 +10:00
hiker
ac779d0652
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-24 16:40:37 +10:00
hiker
a2c4160ce0
Added TerrainInfo raycast to debug view.
2015-07-24 16:37:13 +10:00
hiker
cefce3152c
Fixed #2246 .
2015-07-24 16:36:55 +10:00
hiker
672314fbe2
Added camera-at-side-of-kart debug mode.
2015-07-24 11:00:13 +10:00
hiker
c10bd01703
Merge branch 'Flakebi-fixes'
2015-07-24 10:24:05 +10:00
hiker
8bc398a1c1
Merge remote-tracking branch 'origin/master' into Flakebi-fixes
2015-07-24 10:23:47 +10:00
Marianne Gagnon
aacf1293da
Eliminated karts in GPs get 0 points. Fixes #2177
2015-07-23 20:01:54 -04:00
Marianne Gagnon
5c27769ceb
Fix uninitialized variable use, fixes #2179
2015-07-23 19:52:30 -04:00
Marianne Gagnon
52313c1468
Draw achievements a bit later so that they are on top. FIxes #2237
2015-07-23 19:21:43 -04:00
Elderme
cf80dde333
Move skybox things from irr_driver to Skybox class.
2015-07-23 14:21:47 +02:00
Elderme
94d6d2efd6
Add a Skybox class
2015-07-23 14:21:47 +02:00
auriamg
5164a55472
Merge pull request #2244 from Flakebi/addons-rtl
...
Fix reversed rtl string part
2015-07-22 18:35:22 -04:00
hiker
2f51406e3d
Made field-of-view configurable in the config file.
2015-07-22 08:12:44 +10:00
Flakebi
2eb0f151b7
Fix reversed rtl string part
2015-07-21 11:52:23 +02:00
hiker
bb058deea5
Avoid that the kart is 'shaking' backwards/forwards when flying.
2015-07-21 16:56:51 +10:00
hiker
cd8fd7fb16
Merge remote-tracking branch 'origin/master' into Flakebi-fixes
2015-07-20 09:10:05 +10:00
hiker
8be383015c
Simplified shadow interface.
2015-07-19 13:44:05 +10:00
hiker
91c40e27c2
Reduced number of parameters for Shadow.
2015-07-18 23:41:27 +10:00
hiker
dc68f5f122
Fixed crash when real shadows are used.
2015-07-18 12:26:18 +10:00
hiker
802d4897fe
Removed unused kart properties settings.
2015-07-18 12:24:56 +10:00
hiker
0f09649aa8
Force rerun of cmake.
2015-07-18 11:59:52 +10:00
hiker
e755a7eda8
Merge remote-tracking branch 'origin/master' into graphical_chassis_to_physical_chassis
2015-07-18 11:53:49 +10:00
hiker
ffb3c2ce4c
Moved visual slightly higher (hopefully as much as in the previous implementation),
...
to avoid that the visual chassis disappears into the ground.
2015-07-18 11:42:33 +10:00
hiker
d94f6ffe66
Added documentation about the visual chassis and wheel positioniong.
...
Removed unused/old coda, and moved kart at exactly the same position
as they are in blender.
2015-07-18 10:21:01 +10:00
Marianne Gagnon
675b0b9458
Improve scripting error handling, more work on different shapes for collision triggers
2015-07-17 19:18:12 -04:00
Marianne Gagnon
3cb57358a3
Fix #2242
2015-07-16 19:38:34 -04:00
hiker
68cea42648
Fixed visual position of chassis, wheels and shadow.
2015-07-15 16:35:09 +10:00
Marianne Gagnon
84e78e0d40
Some cleanup to check structures, start adding new cylinder check structure (WIP)
2015-07-14 19:00:00 -04:00
hiker
8c842fb2e8
Fixed incorrect uage of radians.
2015-07-14 22:32:09 +10:00
hiker
210e4fb4ec
Removed optional setting for random-wheel rotation.
2015-07-14 17:36:03 +10:00
hiker
9f687fd6cf
Removed unnecessary computation (now that physics does not include
...
wheel rotation).
2015-07-14 17:27:06 +10:00
Marianne Gagnon
77fac34e41
More cleanup to remove hardcoded things in favor of scripting, and start work to allow for more action trigger shapes (work in progress)
2015-07-13 20:27:16 -04:00
hiker
93282f8abf
Completely removed the usage of a physical wheel radius in the physics, it was
...
never really necessary, the phsyics are basically the same). Wheel rotation is
was refactored to be completely done in KartModel now.
2015-07-09 23:59:53 +10:00
hiker
0345565ea8
Fixed handling of tall karts (accidentally committed debug version).
2015-07-09 16:39:40 +10:00
hiker
5d573832e1
Oops - forgot to change the actual value of 'travel' from cm to m.
2015-07-09 09:15:34 +10:00
hiker
3b9e85af0b
Converted bullet's TravelCM (i.e. in cm) into Travel (i.e. in m).
2015-07-09 00:06:19 +10:00
hiker
aa7bf607bf
Minor cosmetic changes.
2015-07-08 16:38:01 +10:00
hiker
7b11e51f2b
Coding style fixes.
2015-07-08 08:31:32 +10:00
hiker
a28ea76b90
Fix wheel position for karts that are too high.
2015-07-08 08:25:10 +10:00
hiker
9eab818d53
Added fused speed-position commands to the commands to be dropped
...
when the sfx queue is too full.
2015-07-08 08:23:55 +10:00
hiker
43f9cf39bc
Fix shadow to be always on the ground, even when a skid-jump is done.
2015-07-08 08:23:25 +10:00
hiker
62e2f05607
Fixed shadow position, improved wheel position.
2015-07-07 17:02:09 +10:00
hiker
12f942c258
Moved debug camera a bit further back.
2015-07-07 17:00:24 +10:00
Flakebi
84e3b9dbe9
Remove SKID_OLD code
2015-07-03 15:38:20 +02:00
Flakebi
d2ca7d11d7
Remove unused/commented out code
2015-07-03 15:36:45 +02:00
Flakebi
fbf26df23d
Merge branch 'master' into fixes
...
Conflicts:
src/graphics/2dutils.cpp
src/graphics/graphics_restrictions.cpp
src/graphics/render_skybox.cpp
src/graphics/rtts.hpp
2015-07-03 15:29:53 +02:00
hiker
70da00de7d
Merge branch 'master' into graphical_chassis_to_physical_chassis
2015-07-03 16:39:20 +10:00
hiker
9b562d31f4
Replaced Widget's set(De)Activated functions with one setActive(bool)
...
function, which simplifies code for various screen a lot.
2015-07-03 16:19:28 +10:00
hiker
8059544b21
Try to fix advanced pipeline.
2015-07-03 08:22:39 +10:00
hiker
f3dee7241f
Merge branch 'master' into graphical_chassis_to_physical_chassis
2015-07-03 08:15:08 +10:00
hiker
ad3a5ac730
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-03 08:13:39 +10:00
hiker
747aa39bdf
Disable artificial shadow if shader-based shadows are available.
2015-07-03 08:12:55 +10:00
hiker
97499759ec
Revert "Remove shadow blob"
...
This reverts commit 33c0dfe7c2 .
2015-07-03 07:55:50 +10:00
hiker
0631d10f91
Move graphical chassis and wheels to be at the same location as the physical ones.
2015-07-03 07:49:27 +10:00
hiker
369ed86380
Added 'behind kart' camera which helps debugging graphical
...
vs physical chassis position issues.
2015-07-02 16:39:13 +10:00
hiker
34d22a32c7
Improved distance calculation (so that the same distance to the rear
...
of each kart is reached).
2015-07-02 16:35:51 +10:00
hiker
799b4cdf7e
Minor code cleanup.
2015-07-02 08:04:37 +10:00
hiker
04c84fd23d
Moved skidding lights from Kart into KartGFX.
2015-07-01 18:57:44 +10:00
Marianne Gagnon
92974fc4b3
Fix scripting crash
2015-06-30 21:35:17 -04:00
hiker
8aabb30687
Fixed memory leak.
2015-07-01 08:58:15 +10:00
hiker
576270bb17
Coding style changes, removed dead code and unused variables.
2015-07-01 08:57:40 +10:00
hiker
4ec423ff35
Coding style improvements.
2015-07-01 08:22:43 +10:00
hiker
f82bb996ea
Fixed memory leaks of lights.
2015-07-01 08:04:10 +10:00
hiker
b41035a008
Moved nitro_light from Kart into KartGFX.
2015-06-30 21:49:20 +10:00
hiker
42114c163c
Minor refactoring to move more code into KartGFX.
2015-06-30 16:59:48 +10:00
hiker
1bafdf528f
Fix wheel-view camera.
2015-06-29 16:17:14 +10:00
Marianne Gagnon
1ceb05c2cb
More scripting functions to control particles
2015-06-28 19:10:43 -04:00
Marianne Gagnon
eda00e12f9
Expose length method in scripting vector3
2015-06-28 19:03:09 -04:00
Marianne Gagnon
68eb4eb359
Start work to control particle emitters from scripts, and allow getting kart velocity from script
2015-06-28 19:00:25 -04:00
hiker
08529e167f
Fixed memory leak.
2015-06-29 08:41:46 +10:00
hiker
a9958a60a8
Minor cosmetical changes.
2015-06-29 08:41:20 +10:00
hiker
0dc2e66039
Fixed compiler warnings.
2015-06-29 08:24:31 +10:00
hiker
11a213fa8d
Significantly reduced number of audio sfx commands: instead of sending
...
7 commands for each kart (when only engine is actually playing),
now there is only one command being sent: positions of sfx that are
not playing are not sent anymore, a duplication engine position was
removed, and speed and position are combined into one event.
2015-06-29 08:09:42 +10:00
Marianne Gagnon
f992b864e1
More work on moving track objects via scripting
2015-06-25 19:33:28 -04:00
auriamg
4070933364
Merge pull request #2212 from Flakebi/remove-icc
...
Strip ICC headers from png files to silence warning
2015-06-23 21:15:14 -04:00
Marianne Gagnon
be81a7fd11
Increase size of popup, text was truncated at least in french
2015-06-23 18:46:36 -04:00
Marianne Gagnon
64adbb4238
Remove anchor as weapon from help menu, fixes #2173
2015-06-23 18:32:38 -04:00
Marianne Gagnon
74f19f0cbc
Start working on scripting API to move objects
2015-06-22 19:36:30 -04:00
Marianne Gagnon
0fdc7a2d98
Use plural form for resolution change message, fixes #2219 . ALso fix crash in tinygettext code handling plural forms
2015-06-22 19:26:20 -04:00
Marianne Gagnon
ae18901bb2
Try fixing travis build
2015-06-21 19:57:06 -04:00
Marianne Gagnon
b73469caf1
Extend scripting API with random and timeout functions
2015-06-21 19:44:22 -04:00
Marianne Gagnon
9119f5f291
Fixes for scripting documentation
2015-06-21 18:43:31 -04:00
Marianne Gagnon
90cf3176d1
Start adding an audio scripting API, and also fix a deadlock in sfx_manager due to improper release of locks
2015-06-21 18:31:16 -04:00
Marianne Gagnon
789384a7bf
Fix loading scripts in local library nodes
2015-06-18 19:24:39 -04:00
Marianne Gagnon
8119b59af0
More fixes on intially hidden objects
2015-06-18 19:09:13 -04:00
Marianne Gagnon
403d61e754
Allow creating initially hidden objects, that can later be shown through scripting
2015-06-17 19:33:53 -04:00
Marianne Gagnon
b3cc5f9f0d
Try to fix Travis build
2015-06-15 20:09:22 -04:00
Marianne Gagnon
01b9ee2a63
RTT: calculate diffuse coefficients only once
2015-06-15 19:47:52 -04:00
Marianne Gagnon
fa027c11da
Work on hiding/showing library nodes (especially when they contain movable children, which are a special case)
2015-06-15 19:44:31 -04:00
Marianne Gagnon
db55c35ed1
Disable bloom / depth-of-field when using physics debug modes, makes lines easier to see
2015-06-15 19:38:12 -04:00
Marianne Gagnon
97100db507
RTT: avoid computing diffuse coefficients every frame
2015-06-15 19:21:34 -04:00
Marianne Gagnon
f651321ceb
Using system angelscript must now be explicitely requested through an option, shouldn't be enabled by default as this will mostly lead to build errors due to finding a different version
2015-06-15 18:46:06 -04:00
hiker
edbb6892e0
Added comments.
2015-06-13 12:34:33 +10:00
Marianne Gagnon
e35d5a07b4
Little hack : make the kart selection screen seem faster by moving the cursor immediately, and loading the kart model only on next frame. See #2216
2015-06-11 20:22:30 -04:00
samuncle
da6133d72e
Merge pull request #2215 from tobbi/fix_2214
...
Fix flags on GetModule call. Thanks to seebi for the fix
2015-06-12 00:48:29 +02:00
Tobias Markus
b32fff8dad
Fix flags on GetModule call
2015-06-12 00:28:55 +02:00
hiker
d95bdc2ea9
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-06-10 23:18:48 +10:00
hiker
09227fa19d
Finally fully fixed #2213 .
2015-06-10 23:18:06 +10:00
hiker
860135376d
Start to fix resolution change by properly freeing data.
2015-06-10 10:33:47 +10:00
hiker
0162407ff3
Added proper ref-counting.
2015-06-10 10:33:06 +10:00
Marianne Gagnon
32edaa25fe
Adjust load and cleanup sequence for scripts, enabling scripts in library objects
2015-06-09 20:24:17 -04:00
Marianne Gagnon
cb510840ae
Work on scripting, namely improving interaction with library objects
2015-06-05 19:34:46 -04:00
Flakebi
41002fc262
Strip ICC headers from png files to silence warning
2015-06-05 03:32:26 +02:00
Marianne Gagnon
238578c921
More work towards handling library nodes in scripting
2015-06-04 20:12:03 -04:00
hiker
9531f0b3a4
Merge remote-tracking branch 'origin/master' into refactor_shaders
2015-06-05 09:13:27 +10:00
Marianne Gagnon
bd006c875e
Let track objects know what library object they are part of, paving the way for scripting to interact with library objects
2015-06-03 20:34:58 -04:00
hiker
9a1cba3ac8
Merge remote-tracking branch 'origin/master' into refactor_shaders
2015-06-03 15:11:27 +10:00
hiker
9094cbd31a
Added NoCopy to FrameBuffer objects (copying a frame buffer e.g.
...
as a parameter to a function can lead to incorrect results, likely
because on exit of the function, data in the (copied) frame buffer
object is freed, and then not available for OpenGL anymore.
2015-06-03 15:10:11 +10:00
hiker
f59d277f3e
Improve handling of sudden steeper uphill section by increasing the
...
suspension force, which makes it less likely for the kart to hit
the terrain.
2015-06-03 09:03:40 +10:00
hiker
d4f3fc88d6
Merged pull requests #2191 .
2015-06-02 14:50:32 +10:00
hiker
2cf4341916
Merge remote-tracking branch 'origin/master' into refactor_shaders
2015-06-02 14:49:50 +10:00
hiker
1dabb39ed4
Fixed warnings most likely caused by copying a frame buffer object
...
(missing &), added several const to frame buffer references.
2015-06-02 14:19:15 +10:00
hiker
8fd0b9186a
Merge pull request #2198 from nado/Fix-#2164
...
Fix #2164 : Resized max length of mail address up to 254 chars
2015-06-02 13:47:54 +10:00
hiker
0f5a44ea1f
Merge pull request #2209 from AMDmi3/errno
...
Include cerrno for errno; fixes clang compilation error
2015-06-02 13:46:51 +10:00
Dmitry Marakasov
cfbec1f470
Include cerrno for errno; fixes clang compilation error
2015-06-02 04:36:30 +03:00
hiker
a51d56a6e5
Merge remote-tracking branch 'origin/master' into refactor_shaders
...
Conflicts:
src/tracks/track_object_presentation.cpp
2015-06-01 09:28:23 +10:00
Marianne Gagnon
b3d97241d7
Scripting : cleanup, add poweruptype enum
2015-05-31 18:39:40 -04:00
Marianne Gagnon
501dd14bb6
More scripting work on item-object collisions
2015-05-31 18:20:52 -04:00
hiker
9b2994c975
Added documentation to shader base classes.
2015-06-01 08:19:31 +10:00
hiker
2f287fbee6
Removed unused clean-shader functionality (which is now done by
...
shader.?pp), removed global shader name variable.
2015-06-01 08:14:56 +10:00
Marianne Gagnon
8ef16c146e
Scripting work : improve flyable vs object collision callbacks. More work to do still.
2015-05-31 18:09:51 -04:00
hiker
51fb693455
Remove all kill functions for shader reloading after all shaders
...
have been deleted.
2015-05-30 12:37:39 +10:00
hiker
642216da83
Minor coding style change.
2015-05-30 12:16:38 +10:00
hiker
e5a7f27f19
Renamed files to follow our coding style.
2015-05-30 12:16:11 +10:00
hiker
48235a5d77
Turned ShadowMatrices into a stand-alone proper class.
2015-05-30 11:29:08 +10:00
Marianne Gagnon
40ea7f94f0
Scripting work : improve object-kart collision callbacks
2015-05-28 19:57:36 -04:00
Marianne Gagnon
1ada542fa5
Continue porting overworld to scripting
2015-05-24 19:15:50 -04:00
Marianne Gagnon
4c02204eff
Start porting the overworld to scripting
2015-05-24 18:34:01 -04:00
hiker
855c59db09
Removed global variable shadowSplit (missing in previous commit).
2015-05-22 16:45:09 +10:00
hiker
0b2c44ed71
Removed unused function, minor coding style cleanup.
2015-05-22 16:44:22 +10:00
hiker
5ba3dee122
Moved global variable at least into a class.
2015-05-22 16:37:54 +10:00
hiker
ced9e55639
Moved shared shaders into Shaders class.
2015-05-22 16:26:30 +10:00
hiker
cbd5670764
DIE global function - rest in peace, push up the daisies, kick the bucket.
2015-05-22 11:09:51 +10:00
Marianne Gagnon
0a3daf9484
Scripting work : the tutorial is now completely scripting-powered, nothing hardcoded anymore
2015-05-21 20:26:28 -04:00
Marianne Gagnon
17cfc130d0
Merge remote-tracking branch 'ignatenkobrain/ubundle_angelscript'
...
Conflicts:
src/scriptengine/scriptarray.cpp
2015-05-21 20:20:03 -04:00
hiker
e4f29d4dea
Removed one more reference to global functions.
2015-05-22 10:00:26 +10:00
hiker
30fa3345e4
Removed more references to global function.
2015-05-22 09:57:28 +10:00
hiker
0f8d36889f
Remved references to global function.
2015-05-22 09:51:09 +10:00
hiker
813d80a792
Removed two more references to global function.
2015-05-22 09:45:48 +10:00
hiker
c21f6abeb7
Removed one more reference to global function.
2015-05-22 09:42:42 +10:00
hiker
8577f0d185
Removed one more reference to global function.
2015-05-22 09:40:46 +10:00
hiker
9048b6ffcd
Removed one more reference to global function.
2015-05-22 09:37:34 +10:00
hiker
cc9163ca77
Removed one more reference to global function, renamed functions
...
Bind and BindLayer to bind and bindLayer.
2015-05-22 09:29:42 +10:00
Marianne Gagnon
722cd0e181
Merge branch 'Scripting'
2015-05-21 19:29:01 -04:00
hiker
3a64d2c70e
Removed one more reference to global function.
2015-05-22 09:18:21 +10:00
hiker
d2a7e21632
Removed one more reference to global function.
2015-05-21 17:16:03 +10:00
hiker
18179bd18d
Removed one more reference.
2015-05-21 17:12:59 +10:00
hiker
2c68bd194c
Move more code into shader, removed one more reference to global function.
2015-05-21 17:09:53 +10:00
hiker
6f84a4dca1
Moved functionality into shader.
2015-05-21 16:59:40 +10:00
hiker
959d17ccb5
Moved one more reference to global function, minor coding style adjustments.
2015-05-21 16:46:46 +10:00
hiker
abbd54ffa0
Replaced another global function reference.
2015-05-21 16:43:41 +10:00
hiker
4d6a9726b6
Renamed shader.
2015-05-21 16:37:59 +10:00
hiker
dc8361b941
Fixed spelling of shader.
2015-05-21 11:19:40 +10:00
Marianne Gagnon
8113ea128b
Minor scripting work
2015-05-20 20:17:00 -04:00
hiker
101fcf5df7
Removed more references to global function.
2015-05-21 10:09:43 +10:00
hiker
e9c2f0ecf1
One less DrawFullScreenEffect function.
2015-05-20 17:18:55 +10:00
hiker
d437ffa3bf
Removed more accesses to global DrawFulLScreenEffect function.
2015-05-20 17:11:06 +10:00
hiker
8e6d9d2f41
Removed more references to global DrawFullScreenEffect function.
2015-05-20 16:53:30 +10:00
hiker
dec62d63ea
Fixed linux compilation.
2015-05-20 10:08:38 +10:00
hiker
063fb6b65f
Try to fix linux compilation.
2015-05-20 09:19:59 +10:00
hiker
4ef85d692c
Replaced one more call to DrawFulLScreenEffect.
2015-05-20 09:09:34 +10:00
hiker
e241f167a7
Started to remove global DrawFullScreenEffect template.
2015-05-20 08:41:03 +10:00
hiker
d64428db34
Moved more shaders, cleaned up unused code and other left-over bits.
2015-05-19 23:01:36 +10:00
hiker
e0b1e876f0
Moved more shaders.
2015-05-19 21:10:49 +10:00
hiker
ab4f77e80e
Moved more shaders.
2015-05-19 18:55:32 +10:00
hiker
0c2e6c1640
Moved more shaders.
2015-05-19 18:51:26 +10:00
hiker
553a0a8b58
Moved more shaders.
2015-05-19 16:40:47 +10:00
hiker
52017e31ea
Removed unused shader.
2015-05-19 16:36:24 +10:00
hiker
a401096487
Moved more shaders, minor cleanup of coding style in irr_driver.hpp.
2015-05-19 16:34:07 +10:00
hiker
e94c3e5d3f
Removed unused global variables.
2015-05-19 16:11:54 +10:00
hiker
6d8d78be73
Moved more shaders, moved createVAO into Shader.
2015-05-19 16:07:24 +10:00
hiker
2224f4ebfa
Removed unused shader.
2015-05-19 09:39:04 +10:00
hiker
283a7c58b9
Moved more shaders.
2015-05-19 09:36:28 +10:00
hiker
b40f84e89d
Moved more shaders.
2015-05-19 09:20:29 +10:00
Igor Gnatenko
7005f3b069
build: allow to use system angelscript
...
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com >
2015-05-18 17:23:28 +03:00
Igor Gnatenko
65c25065ee
angelscript: don't use deprecated GetParamTypeId
...
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com >
2015-05-18 17:17:19 +03:00
hiker
8e4ee298e0
Moved shaders into render_lighting, fixed coding style for
...
render_lighting.
2015-05-18 21:33:26 +10:00
Nado
2b36759ba3
Resized max length of mail address up to 254 chars
2015-05-18 09:33:21 +02:00
hiker
6def0c752c
Moved more shaders.
2015-05-18 16:52:42 +10:00
hiker
90d7fac6c4
Fixed coding style.
2015-05-18 16:43:30 +10:00
Marianne Gagnon
e290e9003d
Tweak for scripting documentation
2015-05-17 20:12:39 -04:00
Marianne Gagnon
db4c6f4799
Work on scripting console
2015-05-17 20:03:53 -04:00
Marianne Gagnon
080936f144
Work on scripting
2015-05-17 19:27:25 -04:00
hiker
78220d5ed7
Moved more shaders.
2015-05-18 08:49:41 +10:00
hiker
3cb0c6f4c2
Fixed coding style in stkmesh.
2015-05-18 08:22:52 +10:00
hiker
37d787ff38
Fixed linux compilation.
2015-05-17 10:28:37 +10:00
hiker
a50d11df36
Try a different linux fix.
2015-05-17 10:04:01 +10:00
hiker
f0f230b042
Try to fix linux compilation.
2015-05-17 00:56:42 +10:00
hiker
1a09a09dd9
Removed now unnecessary parameter for assignSamplerNames.
2015-05-17 00:22:14 +10:00
hiker
e0ef910137
Renamed TextureRead to TextureShader.
2015-05-17 00:04:19 +10:00
hiker
329a4ac047
Removed multiple inheritance, instead made TextureRead inherit from
...
Shader. work in progress!
2015-05-16 10:39:33 +10:00
Marianne Gagnon
e23f854845
Scripting work
2015-05-14 19:27:32 -04:00
hiker
dc211f2000
Improved coding style.
2015-05-15 08:16:23 +10:00
hiker
488f506932
Moved more shaders into PostProcessing.
2015-05-14 16:43:32 +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
auriamg
0ca0b21327
Merge pull request #2188 from huftis/removestringsorting
...
Don’t sort strings alphabetically (makes the translators’ work much easier)
2015-05-12 21:01:05 -04:00
auriamg
dd80daa5d9
Merge pull request #2189 from huftis/addmissingglyph
...
Add ‘Æ’ glyph to the title font
2015-05-12 21:00:07 -04:00
hiker
3b682ff084
Moved more shaders into PostProcessing.
2015-05-13 09:57:53 +10:00
Marianne Gagnon
7d66dfec0e
Make scripting work on OS X, hoping this doesn't break windows or linux
2015-05-12 19:49:14 -04:00
hiker
56bc14ff31
Moved more shaders into PostProcessing.
2015-05-13 08:55:59 +10:00
Marianne Gagnon
0ea991adee
More work for scripting compatibility on Linux/GCC
2015-05-12 18:31:08 -04:00
hiker
ea69eb3178
Minor style changes.
2015-05-13 08:22:58 +10:00
hiker
26d63ce844
Fixed linux compilation, and some more coding style issues.
2015-05-13 08:14:39 +10:00
Karl Ove Hufthammer
6106ed3ec6
Don’t sort strings alphabetically (makes the translators’ work much easier).
2015-05-12 18:20:11 +02:00
Karl Ove Hufthammer
465130a4a2
Added ‘Æ’ glyph to the title font
...
The glyph was created by combining the existing
‘A’ glyph and ‘E’ glyph, and then retouching the
result to make it look good (both the glyph heights
and the gradients differed for the two letters).
2015-05-12 18:17:20 +02:00
hiker
827b9adce2
Moved more shaders into 2dutils.
2015-05-12 16:48:12 +10:00
hiker
320dd6d1df
Moved more shaders into 2dutils.
2015-05-12 16:43:03 +10:00
hiker
fbad97a4a7
Moved Primitive2DList into 2dutils, fixed coding style of 2dutils.
2015-05-12 16:24:40 +10:00
Marianne Gagnon
6ccebd09b6
Improve scripting compatibility with Linux/GCC
2015-05-11 21:49:13 -04:00
hiker
ee26611759
Moved billboard shader into stkbillboard, cleaned up coding style somewhat.
2015-05-12 10:01:24 +10:00
hiker
f4cf41e466
Moved more shaders into render_gemoetry.
2015-05-12 09:50:18 +10:00
Marianne Gagnon
c48037984d
Update to latest angelscript
2015-05-11 19:40:43 -04:00
hiker
ac3984b403
Fixed linux compilation.
2015-05-11 21:08:52 +10:00
hiker
e337b72789
Moved *Detailed* shader into render_geometry, renamed all detailled
...
to detailed.
2015-05-11 17:17:08 +10:00
hiker
77bfa84609
Moved more render-geometry specific shader into render geometry.
2015-05-11 17:07:31 +10:00
Marianne Gagnon
f269b44208
SCripting branch fix
2015-05-10 20:04:44 -04:00
Marianne Gagnon
a29fa5c4a3
More work on scripting
2015-05-10 19:19:35 -04:00
hiker
f3f30a8057
Moved GrassPass1Shader into render_geometry; fixed up coding style
...
somewhat.
2015-05-11 09:14:43 +10:00
hiker
400f9c612b
Moved SpecularIBLGenerator-shader into IBL.cpp, and ColoredLine
...
shader into Shaders. Fixed codying style of IBL somewhat.
2015-05-11 08:09:09 +10:00
Marianne Gagnon
78f9500b1d
Work on scripting
2015-05-09 21:29:37 -04:00
hiker
93f24f2a74
Removed Shaders instance out of irr-driver, and use a class
...
with static members instead.
2015-05-08 23:46:52 +10:00
Deve
199cda80b1
Merge pull request #2101 from konstin/fix_2095
...
add --log to --help message; fixes 2095
2015-05-08 10:32:05 +02:00
hiker
824b6906c1
Fixed compiler warning.
2015-05-08 13:59:19 +10:00
hiker
7453853c6d
Fixed linux build.
2015-05-08 13:45:43 +10:00
hiker
ba957ca0dc
Merge branch 'refactor_shaders' of github.com:supertuxkart/stk-code into refactor_shaders
2015-05-08 13:21:54 +10:00
hiker
3607cadf62
Merge branch 'origin/refactor_shaders' into refactor_shaders
2015-05-08 13:21:13 +10:00
hiker
310a58541d
Cleanup, part 1 - shaders_util is gone :)
2015-05-08 13:21:08 +10:00
hiker
a16bbf71a4
Converted remaining shaders.
2015-05-08 08:30:51 +10:00
hiker
5070531ad7
Converted more shaders.
2015-05-08 08:02:56 +10:00
hiker
38a1deeff5
Converted more shaders.
2015-05-07 19:18:24 +10:00
hiker
b441dba764
More shaders converted.
2015-05-07 16:40:38 +10:00
hiker
4338fe6144
Migrated more TextureReads to the new shader infrastructure.
2015-05-07 09:54:29 +10:00
auriamg
43add89cc2
Merge pull request #2181 from Flakebi/rtl-fix
...
Fix Random Grand Prix being reversed in RTL languages
2015-05-06 19:07:18 -04:00
hiker
8b9e5acd1a
Converted more shaders to use the new template.
2015-05-07 07:41:51 +10:00
Flakebi
a311281aa7
Fix Random Grand Prix being reversed
2015-05-06 20:39:40 +02:00
hiker
08ea768e16
Moved create*Sampler functions into TextureRead.
2015-05-06 22:33:15 +10:00
hiker
a6b8783d46
Moved bind functions into TextureRead class.
2015-05-06 22:08:03 +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
deve
f019f8622c
Make sure that window size is larger than 0
2015-05-04 11:09:53 +02:00
hiker
0ace0aeb5b
Added comments.
2015-05-04 16:51:50 +10:00
Deve
6082a4502b
Merge pull request #2172 from Flakebi/fix-font_tool
...
Fix Font tool build failure with CMake 3.2
2015-05-03 08:53:15 +02:00
Flakebi
eea9069265
Fix #2171 - Font tool build failure with CMake 3.2
2015-05-03 02:52:15 +02:00
Marianne Gagnon
d98c1044e6
More work on scripting
2015-04-30 20:36:54 -04:00
Marianne Gagnon
1559d03ea1
More work on scripting, test ways to pass arguments to script functions
2015-04-30 20:24:02 -04:00
Marianne Gagnon
585d1c5016
Scripting cleanup, remove hardcoded stuff in favor of more generic approaches
2015-04-30 19:37:11 -04:00
Marianne Gagnon
85cf5b181e
Support extracting translations from scripts
2015-04-30 19:03:54 -04:00
hiker
d32a76cd16
Rearranged order of functions in header to have the dependent/recursive
...
functions closer to each other. Removed unnecessary assignTextureUnit
function (with one argument).
2015-04-29 16:36:48 +10:00
hiker
c91f9655d8
Unlock all karts in multiplayer mode.
2015-04-29 08:18:52 +10:00
hiker
75b24c96ad
Unlock all tracks and GPs in split screen mode.
2015-04-29 08:07:06 +10:00
hiker
aaf20dc919
Fixed #2118 .
2015-04-27 17:14:23 +10:00
hiker
0b7c03b34c
Fixed linux compilation.
2015-04-27 09:40:12 +10:00
auriamg
38e4e4e03c
Merge pull request #2133 from Flakebi/translation-fixes
...
Fix some translation and bidi issues
2015-04-26 19:29:02 -04:00
Marianne Gagnon
dfcaf44058
Scripting work
2015-04-26 19:06:51 -04:00
hiker
eacd599b93
Removed version number warning for Radeon cards on osx (since they
...
have completely different version numbers).
2015-04-27 09:04:16 +10:00
hiker
b14acf2a67
Moved TextureRead into a new file, fixed coding style.
2015-04-27 09:03:33 +10:00
Flakebi
d19112760f
Include algorithm in translation.cpp
2015-04-27 00:14:52 +02:00
Flakebi
5462a62c75
Fix TEST_BIDI in multiplayer KartSelection
2015-04-27 00:13:23 +02:00
Flakebi
af88b4a16f
Fix translation issues with grand-prixs
2015-04-26 23:31:57 +02:00
Flakebi
0b9876c53e
Use isRTLText in the BubbleWidget
2015-04-26 22:55:28 +02:00
Flakebi
fae12f3714
Fix RTL texts with multiple lines
2015-04-26 22:34:17 +02:00
Flakebi
56aecdb692
Fix achievements RTL display
2015-04-25 16:10:54 +02:00
Flakebi
6e0b96c21f
Fix TEST_BIDI option
2015-04-25 16:01:50 +02:00
hiker
e1ef2aa305
Removed TexUnit data structure.
2015-04-25 18:49:18 +10:00
auriamg
f97db81ce3
Merge pull request #2103 from nado/fix_NoFribidi_compilation
...
Fix compilation with -DUSE_FRIBIDI=0
2015-04-24 21:07:12 -04:00
auriamg
e769f995ec
Merge pull request #2104 from nado/fix_#2102
...
Fix #2102 .
2015-04-24 21:06:43 -04:00
auriamg
a4559fc09d
Merge pull request #2107 from Flakebi/fribidi
...
Mark text as RTL when at least one character is RTL
2015-04-24 21:04:46 -04:00
Marianne Gagnon
9f883db6f7
Start work to enable scripting
2015-04-24 20:59:32 -04:00
Flakebi
e795729538
Cache fribidized strings in a map
2015-04-25 02:58:53 +02:00
Marianne Gagnon
fc942433e2
Tweak over previous commit
2015-04-24 20:17:55 -04:00
Marianne Gagnon
30431adc69
Add forgotten credit to Divvy81
2015-04-24 20:17:22 -04:00
hiker
45d6c863b3
Moved AssignTextureUnit to new Shader base class.
2015-04-25 00:57:53 +10:00
hiker
118233fb24
Removed now duplicated code.
2015-04-24 14:57:36 +10:00
hiker
865760ffa4
Fixed reloadShader functionality.
2015-04-24 12:36:25 +10:00
Flakebi
819156106d
Mark text as RTL when at least one character is RTL
2015-04-24 03:45:05 +02:00
hiker
5d098488e6
Use new Shader baseclass for all shaders.
2015-04-24 10:31:37 +10:00
Flakebi
7f80e0e4a3
Remove unused function
2015-04-24 02:02:57 +02:00
Flakebi
4b55526525
Clean more stuff for the new insertValues
2015-04-24 01:58:19 +02:00
Flakebi
59b4e2c97e
Clean some string code
2015-04-24 01:27:04 +02:00
Flakebi
53164e5cbe
Simplify string code
2015-04-24 01:27:04 +02:00
Marianne Gagnon
1cc3a0f0b8
Tweak times of scotland challenge
2015-04-23 19:20:42 -04:00
hiker
bbaf061ae9
Added printFileList to Shader, renamed old global function.
2015-04-24 08:38:04 +10:00
hiker
1a96ed6249
Made SimpleParticleRender based on the new shader base class.
2015-04-24 08:26:17 +10:00
Nado
1a395efbfd
Fix #2102 .
...
Moving output modifier and early exit options (--help, --version,
--log, etc) earlier in the execution so nothing useless is printed.
2015-04-23 20:13:37 +02:00
Nado
76270ce0ec
Fix compilation with -DUSE_FRIBIDI=0
2015-04-23 19:55:12 +02:00
konstin
adceb35812
add --log to --help message
2015-04-23 17:40:20 +02:00
hiker
a51225ec36
Added bypassUBO method to new shader base class.
2015-04-23 17:11:19 +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
959c86d816
Merge branch 'use_log_in_tinygettext'
2015-04-20 17:36:08 +10:00
hiker
b6a10b7603
Use stk font to display menu - which is at least a readable size ;)
...
Hacked the GUI to be a bit easier to scale, but it's still hacky.
Changed default to be what is typically used in stk.
2015-04-20 17:34:51 +10:00
hiker
63406b40f1
Fixed line ending style.
2015-04-17 16:13:57 +10:00
hiker
55079289da
List all GSoC students.
2015-04-17 09:48:45 +10:00
hiker
50ff2e6e35
Fixed donations, udpated samuncle's credits.
2015-04-17 09:40:28 +10:00
hiker
513df96c53
Fixed font tool (by requesting an old opengl context), increased size
...
and added some constants to change the size easier.
2015-04-17 09:24:12 +10:00
hiker
543bb8d303
Updated donations.
2015-04-17 08:29:40 +10:00
hiker
52f77f7d43
Fixed duplicated translator-credits strings.
2015-04-17 08:19:49 +10:00
hiker
fbac4d791c
Updated Asian fonts.
2015-04-16 16:59:12 +10:00
hiker
4ea1145af1
Updated translations credits by running update_po_authors.py script.
2015-04-16 15:29:38 +10:00
hiker
00782180f7
Fixed crash when using translation debugging (only happens if
...
DEBUG_TRANSLATIONS is defined).
2015-04-16 15:28:49 +10:00
hiker
418ccf284e
Remove unnecessary \n after "Launchpad Contributions" (which caused
...
an empty line to be shown in stk); ignore "FIRST AUTHOR" as author.
2015-04-16 15:11:25 +10:00
Marianne Gagnon
4b956ebfce
Update translations
2015-04-15 18:45:29 -04:00
hiker
ad2ca0f394
Merge branch 'fix_2073'
2015-04-16 08:17:36 +10:00
hiker
d4c33b294d
Fixed compiler warning.
2015-04-16 08:15:20 +10:00
hiker
50acbea315
Fix crash in case of invalid kart types (e.g. 'default', which the
...
exporter actually writes if 'default' is selected).
2015-04-16 07:56:41 +10:00
hiker
e8b8bbdd3b
Added display of normals at the vertices of the triangles the kart is driving on
...
to the debug display, which is useful to find why interpolated normals are wrong.
2015-04-15 07:44:50 +10:00
hiker
8f090525fb
Added more skidding particle debug code.
2015-04-14 16:40:50 +10:00
hiker
fb9d422f9b
Made interpolated normals white to make them easier to distinguish.
2015-04-14 16:39:28 +10:00
hiker
ecdf32c01e
Fixed size of shader parameter (though de-facto doesn't matter much).
2015-04-14 16:37:54 +10:00
hiker
0627bd85f3
Added some (commented out) debug features for gpu particles.
2015-04-14 16:35:05 +10:00
hiker
2c44bd1201
Removed unnecessary copy, precompue area of triangle to reduce
...
work when smoothing normals.
2015-04-14 16:21:43 +10:00
hiker
a4264cc063
Visualise the (interpolated) normal at the points where the wheels touch the ground.
2015-04-14 09:33:55 +10:00
Marianne Gagnon
cdde932908
Tentative fix for #2079
2015-04-09 19:58:07 -04:00
Marianne Gagnon
9a905cb579
Merge remote-tracking branch 'Flakebi/bidi-updown'
2015-04-08 20:09:15 -04:00
Flakebi
effe131e4a
Dynamically test if text is rtl or not
2015-04-09 01:57:33 +02:00
Flakebi
66dd089902
Move rtl debug option to a more general method
2015-04-09 01:26:55 +02:00
Flakebi
dffd431f3c
Add isRTLText function
2015-04-09 01:14:56 +02:00
Deve
a4536d7752
Disable texture compression for mesa.
2015-04-08 22:20:04 +02:00
Marianne Gagnon
66db970564
Add context to help translators
2015-04-07 19:32:55 -04:00
Marianne Gagnon
d746ea8aa1
Fix #2068
2015-04-07 19:11:59 -04:00
hiker
67d5e41d2c
Try an improvement for #2073 (stk does not start if /data
...
exists).
2015-04-05 22:14:48 +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
4135ed4be2
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-04-02 10:50:22 +11:00
hiker
3f76b0c68d
Used better icon for achievements in tabs.
2015-04-02 10:46:30 +11:00
auriamg
6af71fe582
Merge pull request #2053 from tobbi/fix_redefinition_warning
...
Fix glVertexAttribDivisor redefinition warning
2015-04-01 19:07:34 -04:00
hiker
d8a918758d
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-04-02 10:03:36 +11:00
hiker
cbd45c26a2
Merge and sort old and new translation credits. Fixed handling of "
...
and some other minor fixes.
2015-04-01 22:24:02 +11:00
samuncle
4b735861cd
Add a particle system
2015-04-01 04:30:17 +02:00
hiker
09a70b8aac
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-04-01 09:44:23 +11:00
hiker
414522e823
First version of a simple script that adds the transifex authors
...
to the list of launchpad authors in the translator-credits string.
The latter is used to display the appropriate in-game credits.
2015-04-01 09:41:37 +11:00
Deve
5e56f8904a
MinGW: Allow to compile wiiuse.
...
Still disabled by default because it requires mingw-w64 and it may not work with other versions.
2015-03-31 19:27:07 +02:00
hiker
c7e785b59c
Fixed translator credits display (translators were repeated before).
...
Added #undef'ed debug mode to only see translations.
2015-03-31 16:16:30 +11:00
Deve
cd67daf4a3
MinGW: Don't show console window in release mode.
...
Removed unused cmake option.
2015-03-30 20:12:25 +02:00
hiker
9cb862f708
Fix travis build.
2015-03-30 11:50:47 +11:00
hiker
8d07d26c25
Updated (c) year to include 2015.
2015-03-30 11:42:50 +11:00
hiker
bcd9654a86
Added missing GPL license.
2015-03-30 11:42:28 +11:00
Marianne Gagnon
2d2624f71c
Merge remote-tracking branch 'Flakebi/fribidi-text'
2015-03-29 20:06:21 -04:00
Marianne Gagnon
3a6fd75f10
Merge remote-tracking branch 'Flakebi/motionblur-fix'
2015-03-29 19:52:16 -04:00
Flakebi
114644233a
Improve RTL display of track names in story mode
2015-03-30 01:23:01 +02:00
Flakebi
9417b80a5c
Fix FPS display
2015-03-30 01:22:59 +02:00
Flakebi
06c8089dfc
Fribidize more strings
2015-03-30 01:22:57 +02:00
hiker
c579eba6db
Removed empty file.
2015-03-30 09:58:28 +11:00
hiker
1971254a7f
Fixed compiler warning.
2015-03-30 09:43:58 +11:00
Flakebi
b041d0d79e
Challenge points were not displayed at the right position for RTL languages
2015-03-30 00:43:23 +02:00
Flakebi
ded789de18
Add option to fribidize everything
2015-03-30 00:43:21 +02:00
Flakebi
e9d78326fb
Properly ignore the leader in the ftl scoreboard
2015-03-29 04:16:24 +02:00
Marianne Gagnon
c08b898742
Merge branch 'Fix_2055'
2015-03-28 21:14:42 -04:00
Flakebi
100060eafd
Don't delete the array on linux and remove a useless memset
2015-03-29 01:43:02 +01:00
Marianne Gagnon
e1eec44d1a
Tweak challenges
2015-03-28 20:16:45 -04:00
Flakebi
19fd2f6361
Allocate memory dynamically in fribidize
2015-03-29 00:57:05 +01:00
Marianne Gagnon
dda3bb0f31
Tweak more challenges
2015-03-28 19:21:48 -04:00
Marianne Gagnon
8deac178d0
Attempt fix for 2055. Committed in a branch for now until we can test it better.
2015-03-28 18:20:28 -04:00
Marianne Gagnon
f2d0b4d7e0
Some challenge tweaks, more coming. See #2052
2015-03-28 18:19:27 -04:00
Flakebi
7c697e76e5
Fix motion blur in multiplayer
2015-03-28 22:30:10 +01:00
Tobias Markus
cedb7e7123
Fix glVertexAttribDivisor redefinition warning
2015-03-28 16:56:51 +01:00
Marianne Gagnon
e65b3414b9
Tweak cocoa challenge. Further testing welcome
2015-03-28 00:14:10 -04:00
hiker
17039141e4
Fix #2051 by keeping a copy of the timer in the SktTimer class.
2015-03-28 01:35:17 +11:00
Marianne Gagnon
80de98f40a
Fix build
2015-03-26 21:26:51 -04:00
hiker
cb522e45bc
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-27 11:54:09 +11:00
hiker
3d4509b863
Add a log statement about outdated drivers or opengl version to
...
the log file (even if the popup for those issues is disabled).
2015-03-27 11:53:25 +11:00
Marianne Gagnon
26bd5a89a0
Use accurate timing for sounds. Fixes #2049
2015-03-26 20:49:36 -04:00
hiker
efcfdcced7
Oops - fixed typo in previous commit ... where I ignored the nicely
...
computed 'accurate' values in the end :)
2015-03-27 11:14:34 +11:00
hiker
0c6f3eb3dd
Tried to increase accuracy by measuing the sleeping time exactly.
2015-03-27 11:07:38 +11:00
Marianne Gagnon
f81f684b34
Improve timings used for audio status. Could be more precise but is good enough for the moment. See #2049
2015-03-26 19:37:17 -04:00
hiker
a560aafa50
Merge branch 'fix_non_hd_option'
2015-03-27 09:33:07 +11:00
hiker
6c57ce8507
Disable texture cache for resized textures (which are all in lower
...
res compared what we use now that we resize _every_ big texture).
2015-03-27 08:05:55 +11:00
hiker
02d5b43d86
Replaced all texture->getOriginalSize() with texture->getSize()
...
to take potentially resized textures properly into account.
2015-03-26 17:12:51 +11:00
Marianne Gagnon
262eeca87f
Update configuration of HD textures in GUI, especially through presets
2015-03-25 20:53:05 -04:00
hiker
27dec2fbf8
Added attribute to irrlicht's driver to enable automatic resize
...
of images that are too big. This is then used to automatically
resize any textures (except fonts, background screen) to be
automatically resized to 512x512 if they are bigger.
2015-03-26 11:28:22 +11:00
samuncle
2f5a2b0337
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-03-26 00:47:08 +01:00
samuncle
a0bd9db496
Add more particle effect
2015-03-26 00:46:52 +01:00
Deve
5828dddde8
Allow to disable popup messages about too old drivers in config.xml
2015-03-25 18:53:09 +01:00
deve
e9c72f800a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-03-25 09:33:46 +01:00
deve
df656fbf64
Allow to compile project using cygwin.
...
Note that you need to have all dependencies in cygwin directory (can be easily installed).
Atm. wiimote and joystick events are disabled.
2015-03-25 09:16:15 +01:00
samuncle
d4f2a801b5
.Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-03-24 18:00:16 +01:00
samuncle
4e9ab3e786
Improved sparks for flame
2015-03-24 17:59:03 +01:00
hiker
366b5aadb5
Updated todo list.
2015-03-24 21:17:25 +11:00
Flakebi
0501e35d95
Prevent toppling over
2015-03-24 04:04:23 +01:00
Flakebi
060bf2a2cf
Reset rotation of first person camera when activating
2015-03-24 02:46:10 +01:00
Flakebi
7a8eaed6ed
Add up and down movement to first person camera (r/f keys)
2015-03-23 22:54:15 +01:00
hiker
a400ac3ed8
Used proper names for GSoC students, renamed version SVN to GIT,
...
and removed version numbers (to avoid confusion that e.g. Deve
is now not listed as contributor to 0.8.1 anymore).
2015-03-23 23:18:24 +11:00
hiker
2ff085c3d0
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-23 17:23:42 +11:00
hiker
b61823e1af
Added GSoC students (initial version, names might need to be changed).
2015-03-23 17:23:03 +11:00
samuncle
9b604d37e5
Add more infor in the changelog
2015-03-23 07:00:48 +01:00
hiker
a01fa2f8a7
Updated changelog.
2015-03-23 16:53:22 +11:00
hiker
52b1aef99c
Updates Asian fonts.
2015-03-23 13:12:28 +11:00
Marianne Gagnon
fab1698d69
Update translations
2015-03-22 21:03:06 -04:00
Marianne Gagnon
633f6c5e30
Update credits
2015-03-22 20:41:13 -04:00
Marianne Gagnon
5a9ce98269
Properly fix lens flare
2015-03-19 20:18:21 -04:00
Marianne Gagnon
c422b61464
Fix lens flare
2015-03-19 19:01:35 -04:00
Marianne Gagnon
5e34ac3a44
Fix bug #2037 (objects in library objects with curve animations not working)
2015-03-18 21:48:22 -04:00
Marianne Gagnon
e596c48f42
Tweak per-track library objects to be grouped in a subdirectory
2015-03-17 20:44:14 -04:00
Marianne Gagnon
184f48b931
Fix movable LOD objects vs scale
2015-03-17 20:36:43 -04:00
auriamg
37d7436b80
Merge pull request #2035 from ZyperPL/highscores-update
...
Fixed highscores update
2015-03-17 19:14:17 -04:00
hiker
321786c287
Removed warning in case of missing wheels (that warning is now
...
part of the exporter, and e.g. Sara's kart has always one wheel missing).
2015-03-17 10:47:49 +11:00
hiker
61a593c556
Merge remote-tracking branch 'origin/revert_improved_bloom'
2015-03-17 10:47:23 +11:00
auriamg
4f949e42bd
Merge pull request #1958 from konstin/devel
...
set "Adjust Lights" base position to camera position
2015-03-15 19:28:10 -04:00
Marianne Gagnon
ba773b8452
Support per-track library objects
2015-03-15 19:26:15 -04:00
hiker
d09f6d3c7a
Revert "Clean bloomblending since it's not used anymore"
...
This reverts commit 2206f8ad5c .
Conflicts:
src/graphics/post_processing.cpp
2015-03-16 08:49:36 +11:00
hiker
d9375c9a43
Revert 65cb55add4 (Make bloom less
...
pixelated using Intel doc) since it causes crashes on hd3000.
2015-03-16 08:37:59 +11:00
ZyperPL
d9405aab3a
Fixed highscores update
2015-03-14 16:16:41 +01:00
Marianne Gagnon
036a6f986a
Update POT file
2015-03-13 21:43:09 -04:00
hiker
fa9a58cbe1
Updated strings for translations.
2015-03-14 09:48:17 +11:00
hiker
6b2d35a86a
Updated 'all tracks' achievement to actually include all tracks :)
2015-03-14 00:14:21 +11:00
hiker
5c4f1f796c
Updated challenges and gp for assets r16110 (renamed chocolate and
...
island).
2015-03-13 23:44:02 +11:00
hiker
dcc8cfac12
Minor style changes.
2015-03-13 16:09:28 +11:00
hiker
ad7ea60d6c
Updated comment.
2015-03-13 16:09:02 +11:00
hiker
7c42468e75
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-13 11:04:04 +11:00
hiker
8203d6b0e4
Fix #1786 (needs r16106 on the assets to work!!!!!).
2015-03-13 11:02:59 +11:00
Marianne Gagnon
7e63566087
Upgrade minimum track version requirement
2015-03-12 19:50:09 -04:00
hiker
06ca68275e
Fixed typo.
2015-03-13 10:12:43 +11:00
hiker
443d570196
Make legacy somewhat working on linux (just in case).
2015-03-12 11:47:38 +11:00
Marianne Gagnon
3157051560
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-03-11 20:28:53 -04:00
Marianne Gagnon
ad68d9a866
Warn if OpenGL is too old
2015-03-11 20:28:35 -04:00
hiker
41a67d4250
Added privacy notice to 'enable internet' dialog; used redirecting
...
URLs for privacy and terms&conditions.
2015-03-12 10:33:42 +11:00
hiker
98671b620d
Added some support to enable a legacy (2.1) opengl context. Many
...
things don't work with that atm (rtt, some transparent textures).
Needs to be manually set in the user's config file.
2015-03-11 16:45:20 +11:00
hiker
acd66f46ff
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-11 14:47:00 +11:00
hiker
55934bd8f1
Fixed cmake on VS (before cmake create would fail, but redoing the configure
...
and then generating the project would still work, so with an existing
project this error was not detected).
2015-03-11 14:45:25 +11:00
hiker
18af0b1c11
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-11 10:50:24 +11:00
Marianne Gagnon
ce9ba74f57
Tweak tooltip to only display if the mouse is actually over the checkbox
2015-03-10 19:56:10 -04:00
Marianne Gagnon
9d5c735ccb
Merge branch 'tooltip'
2015-03-10 19:48:21 -04:00
Marianne Gagnon
26914e60e3
Merge branch 'slider-react-to-mouse'
2015-03-10 19:43:06 -04:00
Marianne Gagnon
a310550904
Small tweaks to pull request, remove unused code, use roundf instead of adding +0.5
2015-03-10 19:42:56 -04:00
hiker
0259522be3
Merge branch 'addonserver-fixes' of https://github.com/Flakebi/stk-code into Flakebi-addonserver-fixes
2015-03-11 10:25:52 +11:00
hiker
886c0e3e9f
Make sure there is always enough push back from kart-terrain collisions
...
to avoid karts getting stuck into the wall.
2015-03-11 08:04:35 +11:00
Flakebi
58957a3fbb
Use camera position for LoD instead of the kart position
2015-03-10 19:04:32 +01:00
Kacper
17f7f84597
Replaced hardcoded values
2015-03-10 16:52:07 +01:00
Kacper
acd1628528
Moved slider's code to onClick()
2015-03-09 19:22:10 +01:00
Deve
0a7234df84
Allow to use shift + tab to switch to previous field.
...
Thanks to xXFlorianXx.
2015-03-09 18:47:38 +01:00
samuncle
248755abee
Merge pull request #2028 from Flakebi/fpscam
...
Improvements for the first person camera
2015-03-09 18:02:14 +01:00
Flakebi
5b8834b48f
Add possibility to attach the fps camera to the kart
2015-03-08 17:35:57 +01:00
Flakebi
b21f6f4782
Improve handling of mouse movement for the first person camera, especially at low framerates
2015-03-08 15:14:31 +01:00
Flakebi
e5abf4cec3
Merge branch 'origin/master' into fixes
2015-03-08 01:16:51 +01:00
Flakebi
ded59ac81e
Fix #1822 - Addons xml file contains wrong xmlns path
2015-03-08 01:04:55 +01:00
Flakebi
2aef246897
Fix #1824 - Hardware stats sends duplicate data
2015-03-08 01:04:30 +01:00
Marianne Gagnon
33feb60d7a
Do not complain about icon-not-found when no icon was ever specified, silences a warning mentionned in #2021
2015-03-07 18:46:42 -05:00
Kacper
1ddc4afc14
Sliders react to mouse
2015-03-07 20:56:44 +01:00
Marianne Gagnon
bc0d7a5ef7
Merge branch 'MovablesAlwaysAtSceneRoot'
2015-03-06 21:27:44 -05:00
Marianne Gagnon
8bd33dba23
Improved handling of scaled physical objects
2015-03-05 20:14:33 -05:00
Deve
0722df79da
Fixed getScale() result when matrix contains very low negative values.
...
See #1548 .
2015-03-05 20:00:02 +01:00
Marianne Gagnon
fb4f4aeb2e
Always create movables at scene manager root
2015-03-04 19:39:12 -05:00
hiker
f347cd0b10
Updated license information for new notification elements.
2015-03-05 11:26:16 +11:00
Marianne Gagnon
c8ae3d117a
Merge branch '1954-fix'
2015-03-03 18:58:26 -05:00
hiker
2a2022eb5b
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-04 07:51:01 +11:00
hiker
3da52bcbfb
Cosmetic changes.
2015-03-04 07:49:13 +11:00
deve
26054a1c60
MinGW: Better pthread names order
2015-03-03 07:17:48 +01:00
hiker
08b1fc01f0
Fix error if files are downloaded using https (as happened because of
...
a server misconfiguration). Add details about the certificate if the
URL contains https (and not only if it's not a downloaded file, i.e.
it is a request with an xml answers that is read from memory).
2015-03-03 16:03:38 +11:00
hiker
22d8482400
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-03 15:55:16 +11:00
Deve
89d5cee4c1
MinGW: Better finding libraries
2015-03-02 19:30:26 +01:00
deve
cb7eab4f03
MinGW: Support for make install
2015-03-02 13:56:48 +01:00
hiker
727f0806a3
Fixed typo in error message.
2015-03-02 19:01:21 +11:00
hiker
b21dafc12b
Added error message type for skins, which is atm only used to display
...
automatic login failures. Added Arthur's new icons for errors, and
friend+achievement icons for Ocean skin.
2015-03-02 18:51:50 +11:00
hiker
07116006a6
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-02 18:30:43 +11:00
hiker
04ebd528bf
Revert "Check the translation of the terms to make sure that they include"
...
This reverts commit 53a830be0b .
2015-03-02 18:26:21 +11:00
Marianne Gagnon
48d5567b3f
Fix #1954 , part 2
2015-03-01 22:05:34 -05:00
Marianne Gagnon
d5736f3a5e
Fix #1954 , part 1
2015-03-01 22:04:20 -05:00
Marianne Gagnon
c4c85257ec
Restore lens flare effect
2015-03-01 20:44:09 -05:00
hiker
53a830be0b
Check the translation of the terms to make sure that they include
...
our official url. If it is not contained, use the original English
terms.
2015-03-02 08:45:56 +11:00
Flakebi
f9919c462f
Improve tooltip text and center tooltips
2015-03-01 22:30:33 +01:00
hiker
a5d800d8d6
Made terms&conditions translatable (but hard-coded the URL).
2015-03-02 07:55:39 +11:00
hiker
cab6149193
Cosmetic change for coding style (removed 2 unnecessary constructors).
2015-03-01 22:46:03 +11:00
hiker
b7fb159de4
Fix #2000 (missing variable initialisation).
2015-03-01 19:41:28 +11:00
Marianne Gagnon
c205aa533b
Add outline on font for instructions in the overworld, fixing cases where the text is hard to read
2015-02-28 20:41:12 -05:00
auriamg
cb5670c843
Merge pull request #1994 from Flakebi/credits
...
Fix transparency of fallback characters
2015-02-28 19:00:45 -05:00
Deve
d6466f82cd
Fixed #2008
2015-02-28 22:38:38 +01:00
hiker
27b80d2c4d
Fix #1999 (split screen not workong in hd3000).
2015-02-28 00:40:14 +11:00
hiker
f542aea53d
Fixed line endings style.
2015-02-27 22:33:03 +11:00
Deve
988f5ea933
Hopefully proper fix for #2007
2015-02-26 20:16:39 +01:00
hiker
832aefeceb
Bugfix: A user that was not online previously could not enter an online
...
username if a user with an online user name was shown before.
2015-02-26 16:29:10 +11:00
hiker
58d9853542
Added debug name to tires dropped in battle mode.
2015-02-26 09:36:08 +11:00
Flakebi
6805ead6e6
Add tooltip to explain usage of per-player handicaps
2015-02-24 23:24:28 +01:00
Vincent Lejeune
26b38a3afe
GodRay use correct screencoord
2015-02-24 22:29:31 +01:00
Vincent Lejeune
419b96c068
Do not use extra uv for mlaa
2015-02-24 22:08:49 +01:00
Vincent Lejeune
af265f8345
Use 30 fps in menu
2015-02-23 22:43:11 +01:00
Vincent Lejeune
bcffedc186
Start working on proper SDSM
2015-02-23 22:35:53 +01:00
Vincent Lejeune
33c0dfe7c2
Remove shadow blob
2015-02-23 22:13:59 +01:00
Vincent Lejeune
2206f8ad5c
Clean bloomblending since it's not used anymore
2015-02-23 22:11:57 +01:00
Vincent Lejeune
06f0188a5b
Fix passthrough shader
...
It was not using half coordinate center
2015-02-23 22:02:32 +01:00
Vincent Lejeune
65cb55add4
Make bloom less pixelated using Intel doc
2015-02-23 21:41:22 +01:00
Vincent Lejeune
b70ce0c714
Remove lens flare, it's yielding too much aliasing now
2015-02-23 19:10:38 +01:00
hiker
e56b4e33bc
Show login screen with error message if automatic login did not work.
...
If user has left main menu screen, an error notification message is displayed.
For #1778 .
2015-02-23 23:06:29 +11:00
hiker
2c1b80b939
Added separate achievement and friend message boxes for Ocean ... which atm
...
is just the peach one (though imho looks better than the previous normal box).
2015-02-23 22:44:35 +11:00
Marianne Gagnon
8a4c240f8b
Tweak subsea challenge, fixes #1997
2015-02-22 20:08:19 -05:00
Marianne Gagnon
e3c408fc0e
Implement interface to allow disabling IBL
2015-02-22 18:25:59 -05:00
hiker
b338a68eb4
Fix #1984 (countries in lower case were not when compared with upper
...
case countries).
2015-02-23 08:32:16 +11:00
Vincent Lejeune
13a2f9f597
First part of #1988 fix
2015-02-22 20:31:14 +01:00
Deve
0f56a4f6d3
Fixed compilation with cmake 3.2
2015-02-22 10:01:46 +01:00
auriamg
dd7eb2cf68
Merge pull request #1992 from leyyin/font_tool
...
Fix font_tool build for Linux
2015-02-21 19:02:15 -05:00
Flakebi
a371338c14
Fix transparency of fallback characters
2015-02-21 18:06:27 +01:00
hiker
359582d0e6
Added support for "Easter Bunny Ears" easter egg.
2015-02-21 11:19:15 +11:00
Daniel Butum
2e19c3a34e
Fix font_tool build for Linux
2015-02-20 11:40:22 +02:00
hiker
f56fc91d42
Fix #1793 by disabling global illumination on osx with intel
...
graphics cards.
2015-02-19 16:21:37 +11:00
hiker
626ae83f43
Added unit test for #1793 .
2015-02-19 16:21:00 +11:00
Vincent Lejeune
9641380171
Fix billboard transparency
2015-02-19 00:44:21 +01:00
Vincent Lejeune
a74c98ec76
Fix for GR GI
2015-02-18 23:45:57 +01:00
Vincent Lejeune
1a861c742c
Add a GR for GI in central_settings
2015-02-18 23:42:42 +01:00
hiker
5f9e4086af
Fixed #1476 (well, better a work around intel bugs).
2015-02-19 09:24:23 +11:00
Marianne Gagnon
bb682ca5fb
Apply workaround to fix #1869
2015-02-17 19:44:20 -05:00
Marianne Gagnon
0652780040
[OSX] brutally exit supertuxkart when pressing the window's close button. Fixes #1220 .
2015-02-17 19:13:13 -05:00
Marianne Gagnon
0ef2181448
Minor update to git ignore file
2015-02-17 19:07:56 -05:00
hiker
7f90d151c4
Use "Local Name" to fix #1977 .
2015-02-17 17:15:25 +11:00
hiker
ada5a20445
Added some (commented out) debug lines that are useful when comparing
...
different kart physics.
2015-02-17 17:14:53 +11:00
hiker
198d6470d7
Let medium kart accelerate a bit less.
2015-02-17 08:33:32 +11:00
hiker
f9bb17384c
Try to balande the different kart physics better.
2015-02-17 08:14:31 +11:00
hiker
93fa075471
Hopefully proper fix for #1938 (crash on osx when exiting race).
2015-02-17 00:14:26 +11:00
deve
93c5d7428f
Update .gitignore file.
2015-02-16 09:32:56 +01:00
Marianne Gagnon
12e583dde0
Add scripts to translate from Transifex
2015-02-15 20:45:52 -05:00
hiker
aae307c8b6
Fixed #1985 (improve message for per-player handicaps).
2015-02-16 09:35:49 +11:00
hiker
1a94788d2d
Tried VERY crude work-around for #1938 (crash when exiting a race on osx).
2015-02-15 21:32:06 +11:00
Marianne Gagnon
975aa7628b
Fix #1981
2015-02-14 18:36:03 -05:00
Marianne Gagnon
e6aea6e0b6
Improve tools and usage of XML encoding, fixes #1982
2015-02-14 18:30:23 -05:00
auriamg
e7a9f8f95d
Merge pull request #1963 from Flakebi/resolutions
...
Sort resolutions by size
2015-02-14 18:04:35 -05:00
Flakebi
92f78aae29
Improve sorting resolutions
2015-02-13 11:47:10 +01:00
Flakebi
6e8f8a15bd
Sort resolutions by size
2015-02-13 11:47:10 +01:00
hiker
cdb35b0804
Added missing initialisation, fixed line endings.
2015-02-13 08:42:09 +11:00
hiker
f437781dcc
Fix #1980 .
2015-02-13 08:41:19 +11:00
hiker
11f233938d
Cherry picked pull request #1917 .
2015-02-13 08:26:25 +11:00
hiker
f6542194d8
Fixed line length.
2015-02-13 08:16:38 +11:00
hiker
c4ccf16ba6
Merge pull request #1979 from leyyin/log-bad-requests
...
Add logging for API requests that are not successful.
2015-02-13 08:15:11 +11:00
Daniel Butum
769eaf4742
Log API requests that do not return success
2015-02-12 10:47:14 +02:00
Daniel Butum
cc4903737c
Add QtCreator project file to gitignore
2015-02-12 10:43:55 +02:00
hiker
4e88cb6753
Fixed #1978 (by removing unnecessary stopMusic in World, which actually
...
stops the menu music, not the tutorial music. It's unnecessary since
startMusic (main menu) later will first stop currently running music.
2015-02-12 16:56:25 +11:00
hiker
93c5012f57
Fixed incorrect label 'debug' for verbose messages and vice versa.
2015-02-12 16:49:16 +11:00
hiker
f589b2063e
Fix crash when going story mode while music is disabled.
2015-02-12 13:19:58 +11:00
hiker
c675b6f38c
Avoid warning at runtime about missing texture.
2015-02-12 13:00:12 +11:00
hiker
2d5f78974a
Merge pull request #1975 from Flakebi/sound
...
Set correct volume for last lap music
2015-02-12 08:02:10 +11:00
hiker
57414348fa
Merge pull request #1976 from Flakebi/nographics
...
Fix crash with --nographics
2015-02-12 08:00:18 +11:00
hiker
72ce6c8bf6
Fixed race over music not playing when sfx are disabled.
2015-02-12 07:57:51 +11:00
hiker
33f87e28f7
Prevent flooding of terminal with "music not playing" messages, added
...
debug error check.
2015-02-12 07:57:25 +11:00
Flakebi
d4f982d7dd
Fix crash with --nographics
2015-02-11 20:52:05 +01:00
Marianne Gagnon
2ba46cff9e
Merge remote-tracking branch 'Flakebi/skidding-light'
2015-02-10 20:09:03 -05:00
hiker
98195c4079
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-02-11 09:18:20 +11:00
hiker
f57ad3c1ed
Try to fix #1972 (things went wrong when stk tried to delete uninitialised
...
sound sources).
2015-02-11 09:16:48 +11:00
Vincent Lejeune
401187dcf0
Try to fix 1937
2015-02-10 22:38:15 +01:00
hiker
a598b0ed1a
Fix after-race sfx which wasn't playing anymore (caused by quick sound
...
effects not having update() called, which is necessary to detect if they
have stopped playing).
2015-02-11 08:06:28 +11:00
Flakebi
91d042da31
Set correct volume for last lap music
2015-02-10 16:52:50 +01:00
hiker
84a84b6776
Try to fix playing without music.
2015-02-10 17:31:35 +11:00
hiker
7d0875878b
Simplified startMusic call.
2015-02-10 17:27:07 +11:00
hiker
ec598d6f41
Start music properly in thread, avoid starting track music more than once.
2015-02-10 17:07:46 +11:00
hiker
2106e0caaf
Merge branch 'minor-fixes' of https://github.com/Flakebi/stk-code into Flakebi-minor-fixes
2015-02-10 15:41:28 +11:00
hiker
8ade65791e
Merge branch 'Flakebi-rename-h'
2015-02-10 11:38:05 +11:00
hiker
325d1a11c1
Merge branch 'rename-h' of https://github.com/Flakebi/stk-code into Flakebi-rename-h
2015-02-10 11:34:21 +11:00
hiker
95ecd0eed1
Let the audio thread run 'all the time' by sending itself an
...
update package after the queue is empty.
2015-02-10 09:22:23 +11:00
hiker
58f0ce412e
Removed unnecessary m_adjusted_gain variable and resetTempVolume
...
function. Fixed that music volume in race could not be changed.
2015-02-10 08:32:05 +11:00
Flakebi
604e712b81
Apply konstin's idea which makes it much shorter
2015-02-09 22:28:47 +01:00
Flakebi
683f42527e
Add light effect when skidding
2015-02-09 15:18:53 +01:00
Flakebi
f86a92286c
Set the music before updating to fix -N too
2015-02-09 01:56:56 +01:00
Flakebi
4abe3ce327
Make music and sound work with fast starts, fixes #1291
2015-02-09 01:22:47 +01:00
Flakebi
d5cbf4fc6b
Math works better with brackets
2015-02-09 01:22:47 +01:00
auria
13bfee5ce1
Do not output line numbers for strings that come from XML, since XML comments are extracted from a fake .h ffile and their location in that intermediary file has no use
2015-02-08 18:17:05 -05:00
auria
671e3829a4
Do not extract strings from wip-tracks. Fixes #1967
2015-02-08 18:05:42 -05:00
hiker
70ed2b47d0
Fix #1962 .
2015-02-09 08:22:35 +11:00
hiker
08493448be
Merge branch 'Flakebi-clang-fix'
2015-02-08 22:24:05 +11:00
hiker
ca2b5335dc
Removed hopefully unnecessary string copy.
2015-02-08 22:22:06 +11:00
hiker
33cb6d9356
Merge branch 'clang-fix' of https://github.com/Flakebi/stk-code into Flakebi-clang-fix
2015-02-08 22:12:39 +11:00
hiker
43aadcef34
Follow coding style for #includes.
2015-02-08 22:12:08 +11:00
Marianne Gagnon
758eb6e003
Use label with word_wrap instead of list for terms. See #1812
2015-02-06 20:11:15 -05:00
Vincent Lejeune
13393ef04b
Fix 1808
2015-02-07 01:55:14 +01:00
Flakebi
d56472c224
Rename some .h files to .hpp
2015-02-05 21:32:17 +01:00
Flakebi
f386f05749
Silence even more warnings
2015-02-05 20:13:33 +01:00
Flakebi
31d4c34fbb
Improve clang bugfix
2015-02-05 15:18:57 +01:00
hiker
2d4200c754
Removed rather embarrassing left-over debug code.
2015-02-05 18:29:05 +11:00
hiker
0ab3d12eab
Fixed invalid name openal error when setting the volume of fast
...
music (apparently caused by trying to set the music of the actually
freeded normal music just before).
2015-02-05 15:22:20 +11:00
hiker
5f59985ef1
Added documentation about which asset version is used for which
...
STK version.
2015-02-05 13:59:16 +11:00
Flakebi
38f0e31a48
Fix clang build, freeing memory too early
2015-02-05 02:58:55 +01:00
Flakebi
d8efe01d02
Fix clang build, freeing memory too early
2015-02-05 02:49:58 +01:00
Flakebi
366f8a26bb
Fix more clang warnings
2015-02-05 02:44:06 +01:00
Marianne Gagnon
ecad7c2996
Mark some emitters as important so that they are never disabled by options, fixes #1808
2015-02-04 20:13:06 -05:00
auriamg
f4909d7c46
Merge pull request #1957 from Flakebi/highscore
...
Improve the layout of the race result screen
2015-02-04 18:50:54 -05:00
hiker
1e994748cc
Properly handle volume setting from sfx thread, removed MusicManager
...
from friends of MusicInformation to enforce this. Added error checks
to properly detect location of warning when faster music is plaued
(still under investigation).
2015-02-05 09:22:13 +11:00
konstin
d489393ff8
set "Adjust Lights" base position to camera position
2015-02-04 19:31:11 +01:00
Flakebi
19ce806563
Fix warnings about shift size
2015-02-04 18:33:26 +01:00
Flakebi
32a044e292
Fix some clang warnings and bugs
2015-02-04 18:30:27 +01:00
Flakebi
1aa6f7c173
Improve the layout of the race result screen
2015-02-04 14:42:10 +01:00
Flakebi
0051254f03
Merge branch 'origin/master' into fixes
...
Conflicts:
src/graphics/graphics_restrictions.cpp
2015-02-04 12:28:39 +01:00
hiker
ddc60f98a1
Removed unnecesary #include.
2015-02-04 18:18:37 +11:00
hiker
eb37092643
Moved all remaining music commands to be handled by sfx thread.
2015-02-04 17:08:22 +11:00
hiker
6aa9ff86a4
Removed unnecessary function.
2015-02-03 16:29:54 +11:00
hiker
b2049eae48
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-02-03 16:28:09 +11:00
hiker
4658bd83de
Handle playing and stopping of music in separate thread. Make the sfx
...
manager thread use CanBeDeleted to allow for timed deleting.S
2015-02-03 16:27:05 +11:00
hiker
b9a7c11dab
Removed unnecessary #includes.
2015-02-03 14:30:18 +11:00
Deve
f2a738f3d9
Fixed problems with non-supported languages.
...
These language files such as "sco.po" or "jbo.po" weren't ignored on STK side and they were displayed in languages list without a name.
2015-02-02 19:13:40 +01:00
hiker
c37e1eec0d
Updated documentation and minor style changes.
2015-02-02 16:31:54 +11:00
auriamg
c7060cf0e2
Merge pull request #1949 from AMDmi3/patch-1
...
Include unistd.h for usleep()
2015-02-01 21:19:05 -05:00
Vincent Lejeune
831c1e7285
Duplicate rule for gallium
2015-02-02 00:42:16 +01:00
Dmitry Marakasov
94bf5949f5
Include unistd.h for usleep()
...
Fixes build on FreeBSD
2015-02-02 00:08:30 +03:00
Vincent Lejeune
1e0a9022a3
Fix attempt for void scene in non advanced pipeline
2015-02-01 19:46:49 +01:00
Deve
2c8639f105
Correct icons path
2015-01-30 18:36:10 +01:00
deve
01835f3e5d
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-01-30 11:42:26 +01:00
deve
ab01161c28
Check more plural forms formats.
...
Launchpad atm. returns plural forms format without parentheses. We can just check both cases - with and without parentheses.
2015-01-30 11:40:33 +01:00
hiker
0b0c1fbaee
Workaround or fix for #1922 - warning about plural form.
2015-01-30 16:29:29 +11:00
hiker
4cf20ff73b
Fix #1940 (achievement do not contain text).
2015-01-30 16:18:26 +11:00
hiker
85b5654d14
The uninstaller is now more secure, it will not delete recursively
...
the install directory anymore, instead only delete subdirs recursively,
and then delete individual files and finally the install directory
non recursively.
2015-01-30 16:17:04 +11:00
hiker
be661c85f8
Merge branch 'Odd0002-master'
2015-01-30 14:18:41 +11:00
hiker
36e903429d
Merge branch 'master' of https://github.com/Odd0002/stk-code into Odd0002-master
2015-01-30 14:18:00 +11:00
Vincent Lejeune
6a50b4b9ac
Revert "WIP wayland"
...
This reverts commit d33efd8800 .
2015-01-29 18:05:01 +01:00
Vincent Lejeune
d33efd8800
WIP wayland
2015-01-29 18:00:33 +01:00
Odd0002
8abccf3ee4
Vastly improve data optimization script
...
Changes include:
- Make each type of data optimization optional
- Multithread all data optimization
- Add B3D to B3DZ compression (disabled by default)
- Optimize images in many more ways
- More comments describing each section and some explanations
- Ability to vastly increase runtime for a few more mb saved (enabled by default; depends on types of optimizations used)
- Probably a few more minor changes
2015-01-27 22:50:52 -06:00
Marianne Gagnon
8755b1b72a
Fix CMake files on OS X to be packaging-friendly
2015-01-27 20:09:00 -05:00
hiker
62bbed278d
Fixed duplicated entries in credits.
2015-01-28 11:05:16 +11:00
hiker
6482d8cc80
Fixed osx compilation (hopefully).
2015-01-28 11:04:40 +11:00
hiker
e724770af5
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-28 09:41:43 +11:00
hiker
a13e13d1d0
Updated donation section.
2015-01-28 09:37:41 +11:00
hiker
82d2240da6
Added support for editor installation.
2015-01-27 16:25:17 +11:00
Vincent Lejeune
886c43ea07
Do not assume glMemoryBarrier does exist if buffer storage does.
...
There is no way to add a fence for client upload then.
2015-01-27 00:13:31 +01:00
hiker
98bf6ccef0
Added test cases for problems discovered with version numbers in #1923 (which
...
have been fixed by now in 07dffdc ).
2015-01-27 07:59:42 +11:00
Deve
07dffdcbc2
Fixed bug with comparing versions
2015-01-25 21:36:24 +01:00
Vincent Lejeune
b7eca5e5c3
Sleep when waiting for sync
2015-01-24 22:27:47 +01:00
Vincent Lejeune
56f1dff65d
Split scattering function in ambiant/point light part
...
This fix #1913
2015-01-24 20:00:04 +01:00
hiker
6d7adcf08d
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-23 11:06:50 +11:00
hiker
6088de960e
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-23 11:09:53 +11:00
Vincent Lejeune
9dcdd53425
Add advanced pipeline GR to hd3000
2015-01-23 01:00:05 +01:00
hiker
27ed23a6e7
Fixed warnings about missing screenshots caused by 'prefetching'
...
screenshots.
2015-01-23 10:59:16 +11:00
Vincent Lejeune
29f19711db
Add a rule in graphic restriction for advanced pipeline
2015-01-23 00:56:14 +01:00
hiker
173abcbd95
Merge branch 'leyyin-master'
2015-01-23 10:53:59 +11:00
hiker
b8ba6f9eb7
Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin-master
2015-01-23 10:35:30 +11:00
Flakebi
595cacfeb6
Someone uses that variable now...
2015-01-23 00:29:33 +01:00
Vincent Lejeune
fdfab19382
Use a reference in parseSceneManager to avoid copying
2015-01-23 00:16:28 +01:00
Flakebi
d6fee72295
Merge branch 'origin/master' into fixes
...
Conflicts:
src/graphics/graphics_restrictions.cpp
2015-01-23 00:15:40 +01:00
Deve
4f5b84a134
Replace spaces by tabs to keep consistency with other irrlicht files.
2015-01-22 18:59:55 +01:00
Deve
5117ab0a0e
Fixed issues with clipboard on linux.
...
Previous version didn't work for me at all when I tried to copy text from external application.
It also fixes problem with crashing GTK3 applications.
2015-01-22 18:52:26 +01:00
Daniel Butum
f18167d345
Fix abortable requests which in turn fixes the sending of the 'client-quit' request to the server when quiting
2015-01-22 17:56:30 +02:00
hiker
9ee520e95b
Fixed version recognition for some amd/ati cards; added test cases.
2015-01-22 16:43:25 +11:00
hiker
94d663eead
Fixed compiler warnings.
2015-01-22 16:29:06 +11:00
Marianne Gagnon
76156920de
Update credits
2015-01-21 20:26:42 -05:00
Marianne Gagnon
e62253c76a
Fix #1897
2015-01-21 20:24:41 -05:00
hiker
e17add7bc8
Allow users to enable high res textures, even if their default
...
value stats that they should be disabled.
2015-01-22 11:38:15 +11:00
hiker
aab8066611
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-21 09:17:14 +11:00
hiker
678eeac836
Disable highdef textures on intel cards on windows.
2015-01-21 09:15:41 +11:00
Vincent Lejeune
788732993f
Add pop up for Mesa < 10.3
2015-01-20 22:50:39 +01:00
hiker
b6c26651e0
Pre-fill online username with local username.
2015-01-21 08:14:56 +11:00
Flakebi
8e4bb4c22c
Add notice about currently unused code
2015-01-20 21:22:46 +01:00
hiker
7725a26dfb
Fixed compiler warning.
2015-01-20 16:40:12 +11:00
hiker
f923a317a8
Select offline tab when internet access is disabled.
2015-01-20 16:39:06 +11:00
hiker
27c51c56d0
Merge branch 'leper-freebsd-fixes'
2015-01-20 15:15:10 +11:00
hiker
f724369a8e
Merge branch 'freebsd-fixes' of https://github.com/leper/stk-code into leper-freebsd-fixes
2015-01-20 14:56:25 +11:00
Vincent Lejeune
b5243089a5
Enable dynamic lights by default
2015-01-20 03:20:33 +01:00
Vincent Lejeune
6c78278292
Remove Apple section in central_settings
...
Hopefully it will just work
2015-01-20 03:11:54 +01:00
Vincent Lejeune
4fd08fa791
Try to fix graphical restriction on OSX
2015-01-20 03:07:23 +01:00
hiker
21eace8f80
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-20 12:22:03 +11:00
hiker
e62dfe2fe5
Updated Asian fonts.
2015-01-20 12:21:22 +11:00
Vincent Lejeune
d35e4d3e7c
Use radeon instead of AMD for graphic restriction
2015-01-20 02:08:46 +01:00
hiker
c352052719
Updated translations.
2015-01-20 11:45:36 +11:00
deve
b2f918455b
Fixed mingw compilation
2015-01-19 10:52:11 +01:00
deve
a0fc3c98e8
Fixed cmake warnings
2015-01-19 09:19:33 +01:00
Vincent Lejeune
121e9d659d
Update INSTALL.md
2015-01-19 02:44:10 +01:00
Vincent Lejeune
573ad4bb1c
Fix make install on linux
2015-01-19 02:22:40 +01:00
Vincent Lejeune
4d9835df0d
And on all os
2015-01-19 00:48:02 +01:00
Vincent Lejeune
8e221df753
Ask newer driver if catalyst below 14.4
2015-01-19 00:46:12 +01:00
Vincent Lejeune
95cb413e39
Remove comment in graphic restriction
2015-01-19 00:43:48 +01:00
hiker
a042397a59
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-19 10:38:31 +11:00
hiker
234d59a5fd
Fix error in xml causing a crash.
2015-01-19 10:38:04 +11:00
hiker
ee9b734edf
Merge pull request #1788 from konstin/old_files
...
deleting some really old doc
2015-01-19 10:30:24 +11:00
hiker
79df2151e9
Add a popup window to be shown first if it is detected that
...
the driver is too old.
2015-01-19 10:21:41 +11:00
hiker
64ce3897e6
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-19 10:18:38 +11:00
Flakebi
aafe86147a
Remove unused method
2015-01-18 23:44:34 +01:00
Flakebi
59534cda86
Fix #1822
2015-01-18 23:40:56 +01:00
Flakebi
9c6dd1c1b5
Fix some compiler warnings
2015-01-18 23:28:53 +01:00
Flakebi
a3489fe834
Fix #1824
2015-01-18 14:40:29 +01:00
hiker
a74a20c699
Enable all message dialogs to work in the DialogQueue.
2015-01-18 12:40:06 +11:00
Marianne Gagnon
636a9bc3cf
Try to fix travis build
2015-01-17 20:21:31 -05:00
Vincent Lejeune
0577099551
Move zlib/libpng/jpeglib outside of irrlicht tree and use system lib on linux
2015-01-18 02:02:10 +01:00
Marianne Gagnon
2e14a8fe20
Do not crash if user config contains an invalid langage, fixes #1905
2015-01-17 19:19:25 -05:00
Vincent Lejeune
73a20508ef
Remove unused shaders
2015-01-17 02:49:48 +01:00
Marianne Gagnon
bbf8a6c934
Merge "cherry-picked" interesting commits from pull request #1850
2015-01-16 18:35:37 -05:00
Marianne Gagnon
0ba0b2fe23
Change previous commit, do it the old way, since travis still uses gcc 4.6
2015-01-16 18:31:01 -05:00
Vincent Lejeune
c8bd922314
Fix attempt for #1836
...
Reinitialize m_sun_interposer each time we load a track
2015-01-17 00:26:06 +01:00
Marianne Gagnon
d2e84c8e86
Fix uninitialized variable
2015-01-16 18:18:56 -05:00
Vincent Lejeune
6e2f2becf7
Fix analysis false positive
2015-01-16 20:41:50 +01:00
Vincent Lejeune
a5230f68da
Remove wad support
2015-01-16 19:07:21 +01:00
Vincent Lejeune
184b52966e
Remove npk and pak support
2015-01-16 19:02:03 +01:00
Vincent Lejeune
b3195e378d
Remove support for lzma and aes encryption
2015-01-16 18:45:52 +01:00
Vincent Lejeune
b4f78070fa
Remove extra defines
2015-01-16 18:34:40 +01:00
Vincent Lejeune
a831b4c9db
Remove bzip2 files
...
Not used anyway
2015-01-16 18:31:51 +01:00
hiker
02f4aa3015
Fixed crash (in race).
2015-01-16 14:58:40 +11:00
Marianne Gagnon
d7266c3300
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-01-15 20:18:39 -05:00
Marianne Gagnon
84821ad604
Add focus callback to GUI engine
2015-01-15 20:18:31 -05:00
Vincent Lejeune
cadc4b3209
Remove 2 deprecated interfaces
2015-01-16 01:59:41 +01:00
Vincent Lejeune
1fb99990b4
Remove light volume related code
2015-01-16 01:57:35 +01:00
hiker
111b3f6361
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-16 11:55:31 +11:00
hiker
5f4ce613c0
Updated help text for new register screen layout.
2015-01-16 11:54:59 +11:00
Vincent Lejeune
c1d85e8674
Remove shadow volume code
...
We use shadowmap
2015-01-16 01:51:56 +01:00
Marianne Gagnon
d3708ba798
Avoid division by 0 in sfx
2015-01-15 19:40:56 -05:00
Vincent Lejeune
c68fee0a07
Remove extra discarded ifdefs
2015-01-16 01:27:17 +01:00
Vincent Lejeune
4151edfd99
Remove RGB support
2015-01-16 01:23:59 +01:00
Vincent Lejeune
510c10153c
Remove WAL/LMP support
2015-01-16 01:20:40 +01:00
Vincent Lejeune
9d99fb65e5
Remove DDS support and its scary legal notice
2015-01-16 01:07:48 +01:00
Vincent Lejeune
222f335300
Remove TGA support
2015-01-16 01:02:48 +01:00
Vincent Lejeune
084350ce40
Remove PCX support
2015-01-16 00:54:46 +01:00
Vincent Lejeune
8f51be8766
Remove PSD support
2015-01-16 00:44:32 +01:00
Vincent Lejeune
0856204b80
Remove PPM support
2015-01-16 00:38:53 +01:00
Vincent Lejeune
f22cf2a05e
Use a fullscreen pass for skybox
2015-01-15 20:50:19 +01:00
Vincent Lejeune
70e8b4c854
When there are 8 lod level, 7 is the max
2015-01-15 19:52:48 +01:00
Vincent Lejeune
86b2d2f327
Remove old functions
2015-01-15 18:52:41 +01:00
Vincent Lejeune
38dcce8fb5
Fix race condition when calculing SH coeffs
2015-01-15 02:54:10 +01:00
auriamg
c5cf42755f
Merge pull request #1882 from math07/working
...
Make note spinner values of addons search bar readable in low resolution
2015-01-14 19:28:53 -05:00
samuncle
5a2ff025bd
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-01-15 00:12:34 +01:00
samuncle
fc670cecf2
Add two new particle effect
2015-01-15 00:11:14 +01:00
auriamg
1baa51418f
Merge pull request #1895 from marcoll/0.8.2-beta
...
Fix music stop problem when loading track selection screen
2015-01-13 18:09:04 -05:00
auriamg
432102b067
Merge pull request #1899 from konstin/dev
...
Add the ability to override asset search patch in cmake; close #1415
2015-01-13 18:04:09 -05:00
Deve
cacb474c42
Add initial values in TrackObject
2015-01-13 17:57:16 +01:00
Deve
6e4f8eef9e
Make sure that we have created SoccerWorld before typecasting
2015-01-13 17:49:06 +01:00
hiker
3eb2d87029
Fix crash first time STK is run.
2015-01-13 17:07:29 +11:00
hiker
593e52dd6f
Reduced indentation somewhat.
2015-01-13 17:04:08 +11:00
hiker
21d27f99e8
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-13 16:51:02 +11:00
hiker
a45867244f
Added unit testing for all currently know variations of mesa version
...
numbers. Fixed all cases in which an incorrect version was detected
previously.
2015-01-13 16:49:10 +11:00
Marianne Gagnon
a2c8e1d982
Prevent crashes due to invalid values in shadow resolution
2015-01-12 19:05:54 -05:00
Vincent Lejeune
08cb4b4297
Fix tangent/bitangent computation
...
Shouldn't make any difference since we don't rescale that much
2015-01-12 23:01:35 +01:00
konstin
2c7474af02
adding the possibility to override STK_INSTALL_DATA_DIR_ABSOLUTE; This was necessary to create a ppa
2015-01-12 22:48:06 +01:00
Vincent Lejeune
cfbbeef441
Clamp lod level in SSAO shader later.
2015-01-12 22:47:53 +01:00
hiker
ea59e77d5f
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-13 08:13:18 +11:00
hiker
ba484d8be2
Fixed incorrect default selection in tabbed screen.
2015-01-13 08:12:43 +11:00
hiker
d70a398cc8
Merge branch 'Flakebi-fixes'
2015-01-13 08:06:39 +11:00
Deve
2f0524dcbd
Fixed memory corruption in three strikes battle
2015-01-12 21:06:47 +01:00
Vincent Lejeune
95e2213b1e
SSAO can me 0 sometimes
2015-01-12 20:13:11 +01:00
Vincent Lejeune
b8ab68b31a
Fix precision issue in SSAO
2015-01-12 20:05:40 +01:00
Vincent Lejeune
3bcdc04279
Fix precision issue in CIE/RGB conversions
2015-01-12 20:05:16 +01:00
hiker
47026e614c
Merge branch 'fixes' of https://github.com/Flakebi/stk-code into Flakebi-fixes
2015-01-12 22:29:08 +11:00
hiker
d47981dd43
Auto-login a new user from the register screen, without requiering
...
to select the user or enter the password again.
2015-01-12 22:27:45 +11:00
deve
1b5ee918f0
Fixed inconsistency in CREDITS file.
...
GP editor wasn't available in 0.8.1 version.
2015-01-12 09:56:20 +01:00
hiker
370091e1b9
Removed debug code.
2015-01-12 16:36:42 +11:00
Marianne Gagnon
c791fd46c1
Path fix attempt
2015-01-11 21:08:46 -05:00
hiker
342cb82653
Merge branch 'new_register_screen'
2015-01-12 12:19:56 +11:00
hiker
a2006c3e16
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-12 12:10:23 +11:00
Marianne Gagnon
81bd79a736
Use absolute paths to lookup materials, fixes karts with identical texture names being in conflict. Also, when a texture is misisng, log an error but don't abort
2015-01-11 20:15:37 -05:00
hiker
7bd1126df8
Improve flow from register screen back to user screen. Now password
...
and online user name do not need to be added again.
2015-01-12 09:41:34 +11:00
Vincent Lejeune
8798eda41b
Remove hardware skinning files
2015-01-11 00:59:09 +01:00
Vincent Lejeune
c18f2bc87b
Blur according to shadow resolution in ESM case
2015-01-11 00:51:22 +01:00
Vincent Lejeune
019ec344fe
Allow to reduce shadow resolution
2015-01-11 00:45:38 +01:00
Vincent Lejeune
cf3e79484c
Remove Scene Loader files
2015-01-11 00:24:26 +01:00
Vincent Lejeune
78ff00fc36
Revert "Remove irrlicht parallax map"
...
This reverts commit c17a093d83 .
2015-01-11 00:18:29 +01:00
Vincent Lejeune
5f6700d355
Remove CSoftwareTexture2.h
2015-01-11 00:10:12 +01:00
Vincent Lejeune
f1e6212b56
Remove IDepthBuffer
2015-01-11 00:02:37 +01:00
Vincent Lejeune
f68ac808d6
Remove software depth buffer
2015-01-10 23:58:28 +01:00
Vincent Lejeune
c17a093d83
Remove irrlicht parallax map
2015-01-10 23:54:01 +01:00
Vincent Lejeune
b7f124de62
Remove irrlicht normal map renderer
2015-01-10 23:49:08 +01:00
Vincent Lejeune
e994712c01
Remove cgmaterial files
2015-01-10 23:44:25 +01:00
Vincent Lejeune
a6b2aa8217
Merge branch 'minlicht'
2015-01-10 21:31:00 +01:00
Vincent Lejeune
6bd852c95f
Remove Quake 3 level load
2015-01-10 21:22:23 +01:00
Vincent Lejeune
a08a9b1af4
Remove remaining MD2 support
2015-01-10 21:10:07 +01:00
Vincent Lejeune
53c8df6733
Remove remaining MD3 support
2015-01-10 21:03:44 +01:00
Vincent Lejeune
231ee1bad4
Forgot to remove some files
2015-01-10 20:50:03 +01:00
Vincent Lejeune
91bcacfd19
Remove CG
2015-01-10 20:44:19 +01:00
Vincent Lejeune
3375b4b93c
Various clean up
2015-01-10 20:25:34 +01:00
Vincent Lejeune
d271ccd2ef
Partly remove MD2 support
2015-01-10 20:14:41 +01:00
Vincent Lejeune
e157bc8601
Partly remove MD3 support
2015-01-10 20:11:10 +01:00
Vincent Lejeune
9a0eacdfdb
Remove WinCE support
2015-01-10 20:08:32 +01:00
Vincent Lejeune
952128928a
Remove OBJ support
2015-01-10 20:02:17 +01:00
Vincent Lejeune
2c82f8d4b0
Remove BSP support
2015-01-10 19:50:48 +01:00
Vincent Lejeune
65f6f0259e
Remove STL (stereolitography...) support
2015-01-10 19:39:53 +01:00
Vincent Lejeune
4c2618211a
Remove LMTS support
2015-01-10 19:32:57 +01:00
Vincent Lejeune
c4903cb8ec
Remove My3D
2015-01-10 19:29:14 +01:00
Vincent Lejeune
e444431572
Remove LWO
2015-01-10 19:21:55 +01:00
Vincent Lejeune
008f2d3422
Remove CSM support
2015-01-10 19:02:40 +01:00
Vincent Lejeune
43b1542dc9
Remove OCT support
2015-01-10 18:30:04 +01:00
Vincent Lejeune
d5cfaab13b
Remove PLY support
2015-01-10 18:14:14 +01:00
Vincent Lejeune
48c45f1910
Remove SMF related code
2015-01-10 18:03:40 +01:00
Marianne Gagnon
bf1fa71be9
Vlj was a little too humble when adding himself to the credits ;)
2015-01-09 21:58:06 -05:00
Vincent Lejeune
20abd15a55
Remove DMF
2015-01-10 03:47:40 +01:00
Vincent Lejeune
9bbe8c61dc
Remove Collada support
2015-01-10 03:18:17 +01:00
Vincent Lejeune
a012a3a14f
Remove IrrScene loader
2015-01-10 03:13:14 +01:00
Vincent Lejeune
7dd48f4d3b
Add myself to the credits
2015-01-09 22:35:21 +01:00
Flakebi
3128e59d22
Update checkboxes and textfield in the tabbed user screen too
2015-01-09 21:37:02 +01:00
Marc Coll Carrillo
798130a40d
Fix music stop problem when loading track selection screen
...
Populate irrlicht's texture cache on startup with all the track
screenshots to avoid the problem
2015-01-09 16:23:37 +01:00
hiker
5ccedfc349
Use tabs in register screen (work in progress).
2015-01-09 09:42:18 +11:00
Deve
d0f96a7673
Allow to cross-compile Windows build under Linux using MinGW.
...
It works fine on Ubuntu. You only need to use:
cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw.cmake
2015-01-08 21:46:59 +01:00
deve
d2c8f2b225
Better finding pthread library.
...
In some case it was found for me in C:\Program Files\Supertuxkart 0.8.1
2015-01-08 13:24:15 +01:00
hiker
b0879514fb
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-08 13:33:16 +11:00
hiker
520625adae
Removed 'sign' (in/out), use 'log' (in/out) instead.
2015-01-08 13:32:50 +11:00
Marianne Gagnon
91b4c6e08a
Apply modified version of pull request #1881 , fixing #1859
2015-01-07 19:53:25 -05:00
Marianne Gagnon
b55d1a2367
Set minimum OS X version in Info.plist, fixes #1863
2015-01-07 18:46:35 -05:00
hiker
526b38fc2a
Added some kind of unit testing for version numbers in graphics
...
restrictions. It's only doing asserts for the tests :) Use
--unit-testing command line switch.
2015-01-08 10:05:19 +11:00
hiker
1eb51db5ea
Added command line option for keyboard debugging.
2015-01-08 09:05:04 +11:00
hiker
474012c442
Prevent potential NULL pointer access.
2015-01-08 08:15:58 +11:00
hiker
d070474445
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-08 08:11:30 +11:00
hiker
8b0a2f303c
Try to fix #1879 : avoid using NULL pointer in case of ignored
...
devices.
2015-01-08 08:09:17 +11:00
Vincent Lejeune
cc43861896
Tangent/Bitangent direction only matters.
2015-01-07 21:51:23 +01:00
Deve
2b6ef130da
Make sure that next track is not higher than tracks size.
2015-01-07 21:42:22 +01:00
Deve
85800f48e6
Disable saving GPs on abort for now because it requires proper implementation.
...
m_next_track should have higher value in this case because race is already finished.
2015-01-07 21:24:52 +01:00
Deve
57ab9e5ac5
Remove saved GPs only in offline mode during starting new race
2015-01-07 21:19:04 +01:00
Deve
2d9e38f7f6
Display continue button only if next track isn't first available in GP.
...
Fixed a crash.
2015-01-07 21:15:53 +01:00
Deve
b726b59427
Remove all saved data for specified GP during start new race.
...
Generally it shouldn't happen because the rule is one save per one GP, but it is possible with old config.xml files.
2015-01-07 18:41:52 +01:00
Deve
cd9bd36520
Don't create new GP save when it's already created
2015-01-07 18:32:32 +01:00
hiker
58f659d43e
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-07 12:18:12 +11:00
Vincent Lejeune
798c2b5355
Forgot a ","
2015-01-07 01:55:22 +01:00
hiker
afc154632c
Fixed typo.
2015-01-07 10:07:43 +11:00
Vincent Lejeune
9b6a1dd69d
Add support for AMD in graphic restrictions system
2015-01-06 23:56:50 +01:00
Vincent Lejeune
02cf7afcf3
Use graphic restrictions system for all CVS query
2015-01-06 23:46:36 +01:00
hiker
596366c3e0
Merge branch 'math07-ach'
2015-01-07 08:40:59 +11:00
hiker
c39f5d0585
Merge branch 'ach' of https://github.com/math07/stk-code into math07-ach
2015-01-07 08:32:16 +11:00
hiker
399bdca947
Simplified implementation of graphical restrictions.
2015-01-07 08:03:49 +11:00
Mathieu Laprise
24944a810c
Add a new achievement : Mosquito Hunter
2015-01-06 14:54:21 -05:00
hiker
949c16cfb0
Changed GrpahicsRestriction API to just use one isDisabled(...) function.
2015-01-06 17:09:16 +11:00
Marianne Gagnon
3a06962ec8
Don't use the digits font to render text, fixes #1864
2015-01-05 20:05:31 -05:00
Marianne Gagnon
c87531fc1b
Disable auto-exit-on-animation-over for feature unlocked screen, should fix #1819
2015-01-05 19:36:04 -05:00
samuncle
91b062ee52
Add amanda in the credits
2015-01-06 01:04:09 +01:00
Mathieu Laprise
765484efd9
Make note spinner values of addons search bar readable in low resolutions
2015-01-05 19:04:01 -05:00
hiker
93a3e6c3da
Allow irrlicht to use an existing file system (instead of creating
...
a new each time a device is created). This simplifies the implementation
of the file manager (now the file manager always exists, even when
deleting the dummy device and creating the real device).
2015-01-06 07:48:32 +11:00
hiker
32366015b7
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-05 15:31:07 +11:00
Vincent Lejeune
b756ebd537
Try to fix acnee.
...
There is still some acnee on third and fourth cascade though but barely
noticeable
2015-01-05 01:30:11 +01:00
hiker
00be07abe6
Force automatic re-run of cmake.
2015-01-05 08:16:08 +11:00
hiker
001544133f
Fixed compiler warnings.
2015-01-05 08:15:51 +11:00
Vincent Lejeune
0d8bb12ec9
VAOManager factorisation
2015-01-04 19:42:45 +01:00
Deve
7a0f635170
Display message about more points to enter challenge only once at the same time.
...
It fixes #1870 .
2015-01-04 18:01:28 +01:00
Deve
752ad0e456
Fixed numpad keys on linux.
...
Patches ported from upstream irrlicht.
2015-01-04 16:09:48 +01:00
auria
f672bbb77e
Extract strings
2015-01-02 18:38:11 -05:00
auriamg
4beb9cdc1c
Merge pull request #1877 from leper/ngettext
...
Support plural translations. Fixes #1852 .
2015-01-02 18:34:47 -05:00
leper
96220966ec
Add plural forms for Gaelic.
2015-01-03 00:25:53 +01:00
leper
d21f0ffa2b
Support plural translations. Fixes #1852 .
2015-01-03 00:25:53 +01:00
auriamg
de82e353e1
Merge pull request #1871 from leper/warning_fixes
...
Fix some warnings.
2015-01-02 18:24:12 -05:00
leper
cb3babef64
Fix some warnings.
2015-01-02 18:16:34 +01:00
leper
1718cb2fce
FreeBSD build fixes.
...
Irrlicht change also submitted upstream https://sourceforge.net/p/irrlicht/patches/300/ .
2015-01-02 17:58:16 +01:00
Deve
d6c099b50b
Move window to max available position if remembered position is out of range.
2015-01-02 13:48:36 +01:00
Deve
bab97833b7
Don't restore window position if it's out of the screen.
...
This should be done by window manager anyway.
2015-01-02 13:05:41 +01:00
auriamg
ca822199b3
Merge pull request #1862 from konstin/lights
...
Make the lights adjustable in a race via the debug menu
2015-01-01 20:17:09 -05:00
konstin
84f5e98e39
corrections from comments
2015-01-02 02:12:43 +01:00
konstin
fa10561d09
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lights
2015-01-01 23:05:26 +01:00
Vincent Lejeune
d84d6381ea
Remove lightning call
...
It should use modern opengl call.
2015-01-01 21:12:15 +01:00
Vincent Lejeune
d849663877
Fix for #1818 thanks to math07
...
Intel gpu seems to have issue capturing screenshot from GL_FRONT
framebuffer, use GL_BACK instead.
2015-01-01 20:46:00 +01:00
Vincent Lejeune
b521691583
Do not export depth value for esm if not enabled
2015-01-01 20:33:52 +01:00
Vincent Lejeune
3451d4e9a0
Add a ESM/PCF switch
2015-01-01 20:06:34 +01:00
Vincent Lejeune
883ab43e29
Assume __VERSION >= 130 everywhere
2015-01-01 03:18:13 +01:00
Vincent Lejeune
1985f188a3
Add some docs
2014-12-31 22:00:47 +01:00
Vincent Lejeune
8c4b2862c0
Factorise shadow matrix computation in a separate file.
2014-12-31 21:39:57 +01:00
konstin
531b94a0ac
cleaning up and adding radius and energy sliders
2014-12-30 18:47:25 +01:00
konstin
334245183e
finer grained control over the values
2014-12-30 18:47:25 +01:00
konstin
7fb129ab05
Make red, green and blue of the nearest visible lamp changable
2014-12-30 18:47:25 +01:00
Deve
c36ca55451
Restore tab name in tracks screen to avoid problems with gettext and to keep consistency with arenas/easter egg screens
2014-12-30 13:22:25 +01:00
Marc Coll Carrillo
00d27b3c63
Don't translate internal "nextgen" track group
2014-12-30 13:19:42 +01:00
Marc Coll Carrillo
a9193e09fd
Unify random GP's ID and translatable name in a single place
2014-12-30 13:19:24 +01:00
Marc Coll Carrillo
9e6cd2a958
Fix translation problems in random GP screen
2014-12-30 13:19:10 +01:00
Marianne Gagnon
3a1b0bc351
Merge remote-tracking branch 'Math07/working'
2014-12-29 19:25:04 -05:00
Deve
c0d7035c26
Use translations in achievements
2014-12-28 22:15:11 +01:00
Mathieu Laprise
2d0503dcfb
Fix a typo regarding my latest commit on issue #1837
2014-12-28 07:58:36 -05:00
Marianne Gagnon
2c5a4a4ffa
Merge remote-tracking branch 'Flakebi/fixes'
2014-12-27 18:25:03 -05:00
Deve
2481db7bac
Fix typo in previous commit
2014-12-27 23:03:28 +01:00
Deve
aa9de807f9
Generate achivements in supertuxkart.pot
2014-12-27 22:50:03 +01:00
Deve
3e6677b755
Rename "title" to "name" in achievements to keep consistency with other xml files such as tracks and karts
2014-12-27 22:43:25 +01:00
Deve
a80d449aaf
Improved update_pot script
...
- added stk-assets path
- restored karts and tracks
- added achevements
- better formatting and faster executing
Updated supertuxkart.pot
2014-12-27 22:12:16 +01:00
Mathieu Laprise
17113f8d0d
Merge branch 'master' of https://github.com/math07/stk-code into working
2014-12-27 15:14:35 -05:00
Mathieu Laprise
7f6a1dfd56
Handle spinner custom text differently differently to fix issue #1837 problem with activation/deactivation and updategfxSlider
2014-12-27 15:10:39 -05:00
Vincent Lejeune
df12714f49
Factorize (and fix) gaussian weight computation
2014-12-27 03:22:18 +01:00
Vincent Lejeune
d8b3cf9c8f
Factorise MRP
2014-12-27 03:22:06 +01:00
Vincent Lejeune
e42cdc5d64
Used #ifndef in header.txt
2014-12-27 03:21:55 +01:00
Vincent Lejeune
f644543bc1
Move all gfx related config to a separate file
2014-12-27 03:14:16 +01:00
auriamg
2d0c929a70
Merge pull request #1847 from gunchleoc/master
...
Some string fixes.
2014-12-26 19:43:21 -05:00
GunChleoc
38936fe79f
Removed ngettext, because tinygettext can't handle it.
2014-12-24 14:54:09 +01:00
Marianne Gagnon
351e69e79d
Fix build
2014-12-23 20:07:34 -05:00
Marianne Gagnon
526e565c4d
Fix memory leak found by vlj
2014-12-23 19:57:29 -05:00
Vincent Lejeune
e421a05663
Remove unecessary files.
2014-12-23 20:35:54 +01:00
Deve
b02812662a
Fixed crash in creating user screen, which occured after rename player.
...
It's a bit quick and lazy fix. Probably other variables should be cleared too.
2014-12-23 18:32:05 +01:00
GunChleoc
ed56858321
Fixed a typo.
2014-12-23 16:21:47 +01:00
GunChleoc
5a7f7781af
Some string fixes.
2014-12-23 13:24:50 +00:00
Flakebi
fbba008a1a
Restore ancient behaviour
2014-12-22 23:12:20 +01:00
hiker
8e142daa00
Fix crash when track is not found.
2014-12-22 08:20:19 +11:00
hiker
89317ce399
Removed unnecessary c_str().
2014-12-22 08:19:54 +11:00
hiker
f4c9724fa9
Detect mesa version.
2014-12-22 07:59:51 +11:00
samuncle
c54fed411f
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-12-21 09:58:06 +01:00
samuncle
b54ddb9828
Add emit map to object pass 2 shader
2014-12-21 09:58:03 +01:00
Deve
4f910713f5
Make some strings translatable
2014-12-20 14:03:11 +01:00
Vincent Lejeune
84ee2c7018
Disable texture compression on Intel Mesa too
2014-12-20 00:32:56 +01:00
Flakebi
57958aba36
Merge branch 'upstream/master' into fixes
2014-12-19 23:02:41 +01:00
Deve
be913245b3
Merge pull request #1833 from smalltock/smallRedundancy00
...
two redundant lines of code that may have caused a tiny memory leak
2014-12-19 11:48:35 +01:00
ZDarian
3995947c1d
two redundant lines of code that may have caused a tiny memory leak
2014-12-19 03:11:18 -07:00
hiker
deb8672446
Allow command line options --kart and --track to select locked tracks.
...
This will allow reviewers to post screenshot of new tracks.
2014-12-19 16:08:35 +11:00
hiker
99f49fbd42
Fixed crash in debug mode when command line option -N is used.
2014-12-19 16:03:24 +11:00
Vincent Lejeune
c4e5a720f7
Do not undefine builtin macros.
2014-12-18 22:09:14 +01:00
Vincent Lejeune
bccde0ce34
Revert "No need to signal the shader the AMD_vertex_shader_layer is enabled"
...
This reverts commit 2e0bec5757 .
2014-12-18 15:57:25 +01:00
deve
a41cac02a2
Update .gitignore file
2014-12-18 08:25:04 +01:00
hiker
d3224712c9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-12-18 16:54:38 +11:00
hiker
6a806470f1
Fixed #1799 (linking issue) - use of VS only functions that were not
...
enclosed on #ifdef (not an issue with default link options, since the
functions using the VS only functions are not actually used in STK).
2014-12-18 16:51:08 +11:00
Vincent Lejeune
116cdec611
Try old method of creating a context
2014-12-18 01:50:09 +01:00
Vincent Lejeune
6139f43108
Do not allow fog start to be null
2014-12-18 01:30:53 +01:00
hiker
e3879abb5b
Work around #1780 (font corruption).
2014-12-17 11:08:28 +11:00
konstin
f6407a0daf
deleting some really old doc
2014-12-16 19:09:58 +01:00
Marianne Gagnon
0af3f3de83
Misc tweaks, mainly to include new island tracks in challenges and GPs, and other minor fixes
2014-12-15 21:34:22 -05:00
Vincent Lejeune
84cf087ae6
Forget to update grass pass 2 sun location
2014-12-16 02:10:26 +01:00
hiker
edd11e3fd2
Changed version number from 'svn' to 'git'.
2014-12-16 11:46:38 +11:00
hiker
62f8e3be2d
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-12-16 09:31:51 +11:00
Vincent Lejeune
7aa7e2d148
Factorise sun color/position
2014-12-15 23:09:19 +01:00
Deve
2995051f7c
Merge pull request #1779 from math07/working
...
When entering gp_name, display buttons vertically to allows gamepad
2014-12-15 12:17:00 +01:00
hiker
3fa8625c78
Fixed incorrect icon name.
2014-12-15 17:10:34 +11:00
hiker
0e569d1c7f
Give the first player tux as icon (instead of sara). Fixes #1771 for now.
2014-12-15 16:49:12 +11:00
hiker
7a9d724bd9
Missing patch in previous commit.
2014-12-15 14:04:55 +11:00
hiker
e4e0dbd5b7
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-12-15 11:37:56 +11:00
hiker
eba7d709c1
Added support for wip-tracks and wip-karts directories, which are only
...
used when artist debug mode is enabled.
2014-12-15 11:10:54 +11:00
hiker
f48f20da94
Fix memory leak.
2014-12-15 10:58:23 +11:00
Vincent Lejeune
22b26dc985
Remove extra uniforms in IBL shader
2014-12-15 00:42:59 +01:00
Vincent Lejeune
03694d9c7c
Factorise SH coefficient in an UBO
2014-12-15 00:18:03 +01:00
Vincent Lejeune
3f8fdc7976
Move FS template declaration in shaders.hpp
2014-12-14 21:58:42 +01:00
Vincent Lejeune
4b2abef56c
Remove redondant uniform in IBL
2014-12-14 21:55:15 +01:00
Vincent Lejeune
1732b1cfef
Clean up sunlight shader + factorize diffusebrdf
2014-12-14 21:39:18 +01:00
hiker
17fe9812b1
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-12-14 12:52:13 +11:00
hiker
8ea8c41597
Fixed memory leaks.
2014-12-14 12:51:53 +11:00
Vincent Lejeune
d50dde4c97
Revert "Try to fix ibl precision issue"
...
This reverts commit 1cf592394b .
2014-12-14 02:48:47 +01:00
hiker
e1c07b3e2c
Fixed memory leak.
2014-12-14 12:30:21 +11:00
hiker
6ffb30d63a
Fixed memory leak.
2014-12-14 12:04:48 +11:00
hiker
6cf4d381ee
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-12-14 11:41:47 +11:00
hiker
0ca09019a2
Fixed minor memory leak.
2014-12-14 11:41:07 +11:00
Vincent Lejeune
1cf592394b
Try to fix ibl precision issue
2014-12-13 22:35:46 +01:00
Vincent Lejeune
7872bc7860
Fix image format for bilateral blur
2014-12-13 22:28:16 +01:00
Deve
7114657c02
Merge pull request #1781 from thamlett/master
...
Fix some typos
2014-12-13 18:07:18 +01:00
Deve
1a4f6e51ee
Fixed problem in dynamic ribbon widgets which contain animations, labels and more than one row.
...
Thanks to marcoll.
2014-12-13 12:49:07 +01:00
Mathieu Laprise
15927f319c
When entering gp_name, display buttons vertically to allows gamepad selection
2014-12-12 20:19:27 -05:00
Marianne Gagnon
91f6fbbb43
Fix typo in previous fix, reported by Math07
2014-12-12 19:41:15 -05:00
hiker
ba990318d1
Merge remote-tracking branch 'origin/master' into new_server
2014-12-13 10:49:45 +11:00
Deve
42d2591bf8
Use default track if remembered track doesn't exist.
...
It avoids issues in #1776 and probably other problems with addons tracks.
2014-12-12 19:54:30 +01:00
Deve
dff1a330ea
Fixed crash in kart selection screen
2014-12-12 19:36:53 +01:00
Marianne Gagnon
72a02128de
Fix gand prix
2014-12-11 20:20:42 -05:00
Marianne Gagnon
59d6a2f258
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-12-11 20:18:29 -05:00
Marianne Gagnon
3226189d82
Force disable shadows and GI when OpenGL is not recent enough. Fixes #1722
2014-12-11 20:18:00 -05:00
Vincent Lejeune
2cf2630362
Forgot UBO support check in shadow
2014-12-12 02:13:33 +01:00
Vincent Lejeune
834683f414
Add codecheck before rendering GI/Shadow
2014-12-12 02:12:14 +01:00
Vincent Lejeune
13360de345
Add a check for GS support
2014-12-12 02:04:33 +01:00
Marianne Gagnon
9b3b99610a
MInor GUI XML cleanup
2014-12-11 19:39:30 -05:00
Marianne Gagnon
0aacea1c0b
Apply math07's patch for taking padding into account in height="fit", fixes #1762
2014-12-11 19:33:44 -05:00
Vincent Lejeune
5f47fee897
Cleanup skybox preparation code
2014-12-11 20:42:18 +01:00
Marianne Gagnon
334cca21ad
Merge branch 'Math07_master'
2014-12-10 21:06:09 -05:00
Marianne Gagnon
7cc28a9755
Revert "Friends Search bar goes off the bottom of the screen #1762 "
...
This reverts commit f98a169e9c .
2014-12-10 21:04:57 -05:00
Vincent Lejeune
1c05d9ef68
Port colored lines too
2014-12-11 01:44:58 +01:00
Vincent Lejeune
db6600a687
Frustrum shader is updated to new system
2014-12-11 01:19:17 +01:00
Vincent Lejeune
c638be6412
Do not use motion blur if no boost amount
2014-12-10 19:06:58 +01:00
Vincent Lejeune
ed82106fe6
Try to fix #1772
...
Avoid doing glViewport call in IBL.cpp since the result is not used
without dynamic light.
2014-12-10 17:35:09 +01:00
hiker
c0c4357331
Switch from IP address to addons.supertuxkart.net (including new
...
certificate).
2014-12-10 23:53:47 +11:00
hiker
3c6204732e
Switch to fast music immediatley on lastp lap, and not only
...
when 30 seconds are left.
2014-12-10 17:02:39 +11:00
hiker
e05af1cd0b
Added support for "<" relations in graphical restrictions, fixed
...
compiler warnings.
2014-12-10 14:18:26 +11:00
hiker
cad0fba747
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-12-10 14:12:39 +11:00
hiker
adaeb37465
Modified sources.cmake to trigger automatic run of cmake.
2014-12-10 14:11:15 +11:00
samuncle
cb8017cae1
clamping values to avoid pink specularity
2014-12-10 03:02:36 +01:00
hiker
f0ddaa50a5
Removed option to disable CURLOPT_SSL_VERIFYPEER, since it's not needed
...
anymore.
2014-12-10 12:55:32 +11:00
hiker
93b4aa15c2
Disable CURLOPT_SSL_VERIFYHOST on OSX, since it doesn't work (with
...
osx's curl version at least).
2014-12-10 12:23:35 +11:00
hiker
b592e5224b
Updated the URL to work with new server configuration.
2014-12-10 11:35:43 +11:00
hiker
83f49ec319
Merge remote-tracking branch 'origin/master' into new_server
...
Conflicts:
src/online/http_request.cpp
2014-12-10 11:25:16 +11:00
Vincent Lejeune
a8ce996047
Revert "Simplify sunlight shadow shader."
...
This reverts commit cc7f95163c .
2014-12-09 21:20:55 +01:00
Vincent Lejeune
f241fc3b71
Use clamp mode for tex shadow
2014-12-09 19:09:31 +01:00
Vincent Lejeune
cc7f95163c
Simplify sunlight shadow shader.
2014-12-09 19:00:21 +01:00
Vincent Lejeune
c91c04c862
Same for shadow blur pass
2014-12-09 18:54:27 +01:00
Vincent Lejeune
b24fd621a5
Precompute coefficient in gaussian blur pass
2014-12-09 18:43:48 +01:00
Vincent Lejeune
d84d103b03
Wrap azdo check into a function call
2014-12-09 18:21:07 +01:00
Vincent Lejeune
d8e6ebbb0e
Use correct name for passthrough texture
2014-12-09 18:07:31 +01:00
hiker
05f2af79c9
Fixed #1770 (tabs disappear).
2014-12-09 16:50:16 +11:00
Vincent Lejeune
d97b9f2d0e
Clamp SpecularIBL value on positive range
2014-12-09 01:33:58 +01:00
hiker
25e059dd3e
Merge remote-tracking branch 'origin' into copy_kart_mesh
2014-12-09 08:50:23 +11:00
hiker
ca55212062
Fixed ref-counting.
2014-12-09 08:47:40 +11:00
hiker
2c2847e912
Fixed line endings.
2014-12-09 08:05:16 +11:00
hiker
5b62d94c5b
Minor performance optimisations.
2014-12-09 07:56:18 +11:00
Vincent Lejeune
36d20773d7
Unbind everything before deleting
2014-12-08 19:43:41 +01:00
Vincent Lejeune
2667791621
Tweak IBL
2014-12-08 19:36:23 +01:00
Vincent Lejeune
72fdf816e7
Fix Importance sampling
2014-12-08 19:16:26 +01:00
Vincent Lejeune
2b0680d92d
Use texture buffer instead of uniform for samples
...
Should fix nvidia glsl error
2014-12-08 18:24:43 +01:00
hiker
b764339b20
Moved cloning of animated mesh into CSkinnedMesh (to get access to
...
private members). Fixed animation bug, caused by copying already
animated vertex position from LocalBuffer to Weight (so they were
then later animated again). Might need a better solution to avoid
copying mesh twice (LocalBuffer = Weight, followed by Weight = LocalBuffer).
2014-12-08 23:39:41 +11:00
hiker
f0d430c833
Fix #1761 (Players tab in Options autofocus issue).
2014-12-08 15:22:12 +11:00
Timothy Hamlett
e473b656d2
Fix some typos
2014-12-07 16:49:17 -06:00
Vincent Lejeune
6041c48fbe
Source DiffuseIBL algorithm
2014-12-07 21:37:16 +01:00
Vincent Lejeune
a320eebece
Cleanup tonemap shader
2014-12-07 21:27:26 +01:00
Vincent Lejeune
a094bbae19
Factorize DiffuseIBL and SpecularIBL
2014-12-07 19:10:22 +01:00
Vincent Lejeune
2e0bec5757
No need to signal the shader the AMD_vertex_shader_layer is enabled
2014-12-07 18:48:45 +01:00
Vincent Lejeune
e491422bdc
Weight sample in importance sampling
2014-12-07 18:26:51 +01:00
Marianne Gagnon
7686628401
Allow animated meshes in LOD, fixes #1747
2014-12-06 19:51:46 -05:00
Mathieu Laprise
f98a169e9c
Friends Search bar goes off the bottom of the screen #1762
2014-12-06 17:28:02 -05:00
Mathieu Laprise
701a8a2c7b
Merge remote-tracking branch 'upstream/master'
2014-12-06 17:25:46 -05:00
Vincent Lejeune
1bd83f4140
Use omp for IBL gen + force some typecast
2014-12-06 23:20:46 +01:00
Vincent Lejeune
6d88a6547b
Fix GI viz
2014-12-06 21:46:44 +01:00
Mathieu Laprise
107e434fe9
Missing button in grand prix editor name dialog #1765
2014-12-06 15:14:27 -05:00
Marianne Gagnon
68db893e84
Message dialog: set buttons text before layout occurs, so that buttons get the proper size. Fixes #1764
2014-12-05 21:11:56 -05:00
Vincent Lejeune
7367342755
Fix split_stream wrong blending op
...
"immediate_draw" objects were assumed to be always blended but
splitstream is additive.
2014-12-06 02:06:59 +01:00
Marianne Gagnon
8a2128fe7e
Cleanup additive material detection
2014-12-05 19:55:24 -05:00
auria
d3ba1ca283
Update strings
2014-12-05 19:26:09 -05:00
Marianne Gagnon
f05618b3b9
Add possibility to specify non-translated texts in GUI XML files, and use it for debug strings that should not be translated
2014-12-05 19:17:52 -05:00
Vincent Lejeune
1e2656dc88
Use clamp instead of max(0, dot(normalized, normalized))
...
Should help GLSL compiler to optimize them.
2014-12-05 17:51:18 +01:00
Vincent Lejeune
8f3b8cf448
Implement specular IBL properly
2014-12-05 16:42:49 +01:00
Vincent Lejeune
c2d7356d05
Refactor IBL gen code
2014-12-05 16:42:49 +01:00
hiker
48593534a5
Added certificate for our vps.
2014-12-05 13:57:27 +11:00
Vincent Lejeune
4079c18050
Update graphic restriction
...
This should fix bug #1519
2014-12-05 01:38:54 +01:00
Vincent Lejeune
fd2da4085b
Rename some shader to improve their meaning
2014-12-05 00:20:16 +01:00
Vincent Lejeune
23b781e7dd
Move glossmap formula to getspecular shader
2014-12-05 00:09:15 +01:00
hiker
60cde7e63d
Added option to disable peer verification in curl. This might help
...
on some platforms (osx) with authentication problems.
2014-12-04 16:43:57 +11:00
hiker
abb486b640
Fixed server version to be 2.
2014-12-04 16:27:29 +11:00
hiker
645f01a508
Removed 'can use existing stkaddons' account from message.
2014-12-04 16:24:14 +11:00
hiker
cc17d8e0b2
Set our vps as new online server.
2014-12-04 16:23:21 +11:00
hiker
d1fc8d53f4
Added error checking when setting the certificate to connect to our server.
2014-12-04 11:39:56 +11:00
Marianne Gagnon
f8f3dc6c4a
Merge branch 'SlipstreamCleanup'
2014-12-02 20:36:43 -05:00
Marianne Gagnon
1032506adf
Make it (IMHO) clearer how to enable the splistream debug define. Now I see things!
2014-12-02 20:36:27 -05:00
hiker
5cb3e90dfc
Fixed displaying online friend achievements.
2014-12-03 12:24:30 +11:00
Marianne Gagnon
77c2e8a5fb
Continue slipstream cleanup, still doesn't work
2014-12-02 20:21:11 -05:00
Marianne Gagnon
5444336410
Cleanup slipstream code to use the new material manager properly. This is unfortunately non fonctional (nothing visible on screen) and I have absolutely no clue why. Still this cleanup is necessary...
2014-12-02 20:12:11 -05:00
hiker
4d3bbd2c78
Fixed translation support.
2014-12-03 11:40:04 +11:00
hiker
59540abb59
Removed hard coded <B> for backwards (though that message is not
...
even shown atm).
2014-12-03 11:39:39 +11:00
hiker
8e8d7cfc19
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-12-03 10:41:22 +11:00
hiker
34f3755976
Added comments for translators.
2014-12-03 10:40:19 +11:00
Marianne Gagnon
d38b7ca080
Fix a few strings
2014-12-02 18:38:54 -05:00
hiker
dd45bc7f1b
Merge branch 'thamlett-master'
2014-12-03 08:19:35 +11:00
hiker
d725d97314
Fixed coding style.
2014-12-03 08:19:13 +11:00
hiker
9dc6425242
Merge branch 'master' of https://github.com/thamlett/stk-code into thamlett-master
2014-12-03 08:05:34 +11:00
hiker
26eb5263b3
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-12-02 17:13:09 +11:00
hiker
3ba2470619
Added support to detect version numbers on nvidia.
2014-12-02 17:11:29 +11:00
Timothy Hamlett
42d6f0480c
Actually fix #1754
...
Thanks to Hiker for the help!
2014-12-01 21:48:12 -06:00
Marianne Gagnon
35f55c19a1
Tweak jungle challenge to use Cocoa Temple and a slightly adjusted time
2014-12-01 18:42:46 -05:00
samuncle
3627719440
min max where inverted
2014-12-01 23:54:34 +01:00
Vincent Lejeune
7e2add8c53
Clean lensflare related file
...
A new method is used now.
2014-12-01 21:07:29 +01:00
Vincent Lejeune
4db0f8ebf6
Do not reorient shadow cam
...
It didnt really improve shadows resolution
2014-12-01 21:00:28 +01:00
Timothy Hamlett
263d072c98
Fix some coding conventions
...
Thanks to hiker for the info
2014-12-01 12:49:15 -06:00
Deve
24e850db79
Delete xx
...
I simply try to delete it directly on github ;)
2014-12-01 08:10:12 +01:00
Timothy Hamlett
d95f7835fd
Fix some compiler warnings in Irrlicht
2014-11-30 22:29:52 -06:00
Timothy Hamlett
211e698a29
Add some strings for Windows 8 and 8.1
...
And server '12 and server '12 R2
2014-11-30 22:29:28 -06:00
Timothy Hamlett
0a3d71aead
Add Windows 8.1 to the hardware reports
2014-11-30 22:27:39 -06:00
Timothy Hamlett
b0dbacc386
Fix #1754
2014-11-30 22:26:36 -06:00
hiker
006a7f95c9
Cherrypicked pull request #1743 (cppcheck performance fixes).
2014-12-01 15:14:27 +11:00
hiker
c3f5294c27
Changed line endings.
2014-12-01 12:00:43 +11:00
Vincent Lejeune
354dad7392
Fix an error when indirect instancing is not supported
2014-12-01 01:46:50 +01:00
hiker
06aa115155
Merge branch 'master' into copy_kart_mesh
2014-12-01 11:43:01 +11:00
hiker
9dd46b6755
Try to copy the animated kart mesh.
2014-12-01 11:41:14 +11:00
Marianne Gagnon
f31a458fb8
Disable compressed textures checkbox in options where unsupported
2014-11-30 18:44:43 -05:00
Vincent Lejeune
0aa6b9fcd1
Make sdsm optionnal
...
scene manager is not ready yet
2014-11-29 01:33:10 +01:00
Vincent Lejeune
7a92a4a8ef
Disable texture compression on Intel
2014-11-29 01:27:54 +01:00
Marianne Gagnon
53bc15ad50
Merge remote-tracking branch 'origin/OSXFullscreen'
2014-11-28 18:50:51 -05:00
Marianne Gagnon
70da81bf4e
Fix OpenGL 3.2 core profile use in fullscreen mode on OS X
2014-11-27 18:59:51 -05:00
Flakebi
abc8394801
Fix two little glitches in intro and outro scenes
2014-11-27 15:20:12 +01:00
hiker
63250237a4
Fixed linux compilation.
2014-11-27 23:27:27 +11:00
hiker
14145b4e2c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-27 23:06:12 +11:00
hiker
c1a84671c2
Merge branch 'master' of github.com:supertuxkart/stk-code
...
Conflicts:
src/karts/kart_model.cpp
2014-11-27 22:52:08 +11:00
hiker
2ea0c0533a
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-27 22:40:46 +11:00
hiker
71994c692f
Fixed replay mode.
2014-11-27 22:34:04 +11:00
hiker
020c129691
Specify the replay buffer size as time value (i.e. how many seconds),
...
not how many frames.
2014-11-27 16:15:53 +11:00
hiker
6e3c766749
Minor improvements to fix for #1713 .
2014-11-27 15:36:56 +11:00
Vincent Lejeune
bf98d296eb
Fix #1734
2014-11-27 01:31:28 +01:00
Marianne Gagnon
12c54cb92b
Revert old workaround, fix the original issue in a cleaner way
2014-11-26 19:30:09 -05:00
hiker
ce1586532d
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-27 09:32:39 +11:00
hiker
4e00f691dc
Added an assert to check if new was successful.
2014-11-27 09:17:08 +11:00
hiker
673a9f39c6
Merge branch 'Flakebi-fixes'
2014-11-27 00:07:00 +11:00
hiker
d4ea2e8786
Merge branch 'fixes' of https://github.com/Flakebi/stk-code into Flakebi-fixes
2014-11-26 23:56:33 +11:00
hiker
7c7fb68e82
Try fixing #1713 (crash pessing ESC on login screen).
2014-11-26 23:40:50 +11:00
hiker
45b19997de
Fixed compiler warning (double to float).
2014-11-26 22:27:35 +11:00
deve
bf79df9e88
Fixed typo
2014-11-26 10:54:44 +01:00
Flakebi
e4777d0c63
Prevent the max speed of the fps camera to be less than 0
2014-11-26 09:02:34 +01:00
Flakebi
c4cdfc4a0e
Merge branch 'upstream/master' into fixes
...
Conflicts:
src/input/input_manager.cpp
src/states_screens/kart_selection.cpp
2014-11-26 07:34:26 +01:00
deve
cac87cce34
Fixed mingw compilation.
...
I don't know how it worked previously because MEMORYSTATUSEX was there rather longer time and it needs this definition.
2014-11-26 06:46:03 +01:00
Marianne Gagnon
eda6f6c2f5
Merge branch 'master' into OSXFullscreen
2014-11-25 19:35:09 -05:00
hiker
ea3a433147
Fix #1620 (Player's achievements can only be seen when logged in).
2014-11-25 17:12:47 +11:00
hiker
49474a5370
Fixed my "Better handle out-of-memory situations." ... to now actually work :P
2014-11-25 17:08:31 +11:00
hiker
ebfbf5e2aa
Updated pot file (just to check launchpad integration, no string freeze yet).
2014-11-25 15:05:51 +11:00
hiker
8ef2c63857
Merge branch 'tobbi-cppcheck'
2014-11-25 14:15:37 +11:00
hiker
6fbcd90226
Better handle out-of-memory situations.
2014-11-25 14:14:32 +11:00
hiker
aac261d873
Use proper format (instead of casting unsigned to int).
2014-11-25 14:02:34 +11:00
hiker
63e5acdf2b
The (float) cast is not necessary, and makes it harder to read.
2014-11-25 14:00:43 +11:00
hiker
51be8195bc
Merge branch 'cppcheck' of https://github.com/tobbi/stk-code into tobbi-cppcheck
2014-11-25 13:58:59 +11:00
hiker
af186b6926
Fixed compiler warnings.
2014-11-25 13:58:28 +11:00
Marianne Gagnon
346bae4d03
Fix LOD issues in multiplayer, fixes #1710
2014-11-24 19:08:20 -05:00
Marianne Gagnon
cd7bc96d68
Fix invalid snow particles XML file that would cause assertion failures
2014-11-24 18:31:38 -05:00
samuncle
82b8548066
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-11-24 21:10:08 +01:00
Deve
220d3dbc9a
Restore screenshot properties
2014-11-24 20:41:49 +01:00
samuncle
92801f2b74
Tweak the snow
2014-11-24 20:23:55 +01:00
Deve
54b311f6f7
Allow to set custom ratio for images from xml file.
...
It avoids crashes and memory leaks after changing resolution.
2014-11-24 19:31:46 +01:00
hiker
5fd1e30a75
Fixed crash when using --slipstream-debug, but colour change to indicate
...
slipstream states does not work yet.
2014-11-23 21:54:41 +11:00
hiker
9a02693d31
Fixed compiler warnings, renamed playerID to player_id (to follow
...
our style guide).
2014-11-23 21:13:49 +11:00
hiker
24b1a3af32
Fixed compiler warnings.
2014-11-23 21:13:12 +11:00
Marianne Gagnon
5d5460d845
Add way to test intro cutscene easily; do not throttle sound effects on cutscenes
2014-11-22 18:21:31 -05:00
samuncle
91736e1941
Add the support for emit map. For the moment it's only for solid objects
2014-11-22 15:59:22 +01:00
Flakebi
1585199ccc
Change variable names again
2014-11-22 13:44:27 +01:00
Flakebi
bc62d2e6ff
Merge branch 'upstream/master' into fixes
2014-11-22 13:37:05 +01:00
Flakebi
632efb296c
Fix first player in kart selection doesn't get focused
2014-11-22 13:35:31 +01:00
Vincent Lejeune
d426a395bb
Use old formula for glossmap
2014-11-22 02:03:20 +01:00
Marianne Gagnon
3d7518b1d0
Merge branch 'fpsCam'
2014-11-21 18:26:13 -05:00
Marianne Gagnon
c7b43b49e7
Tweak variable names
2014-11-21 18:25:50 -05:00
Vincent Lejeune
f3a637fb99
Fix sun area light
2014-11-21 02:44:27 +01:00
Vincent Lejeune
79e5e9f880
Revert "Use f0 in fresnel schlick"
...
This reverts commit acdafc5566 .
2014-11-21 02:09:02 +01:00
Vincent Lejeune
593f462ec5
Revert "Use color for specular"
...
This reverts commit fcba1dab86 .
2014-11-21 02:09:00 +01:00
Vincent Lejeune
4a8afd2d40
Implement sun as an disk area light.
...
Solid angle is defaulted to sun's one.
2014-11-21 01:54:30 +01:00
Marianne Gagnon
954dba0873
Other OSX fullscreen attempt
2014-11-20 18:21:18 -05:00
Tobias Markus
2c12942871
Revert change in irr_driver.cpp
2014-11-20 23:17:25 +01:00
Tobias Markus
22c22b864a
Fix further issues
2014-11-20 23:15:05 +01:00
Flakebi
9e5eced8df
Improve smooth camera movement and move settings to user config
2014-11-20 23:01:40 +01:00
Vincent Lejeune
fcba1dab86
Use color for specular
2014-11-20 22:57:32 +01:00
Vincent Lejeune
acdafc5566
Use f0 in fresnel schlick
2014-11-20 22:51:22 +01:00
Vincent Lejeune
fcb43fb983
Clean some useless decl
2014-11-20 22:34:19 +01:00
Vincent Lejeune
3d070995f3
Remove a shader callback
2014-11-20 22:27:00 +01:00
Tobias Markus
416c97bf0e
Fix last error
2014-11-20 22:20:45 +01:00
Vincent Lejeune
baf1db8769
Factorize some code
2014-11-20 22:11:14 +01:00
Vincent Lejeune
bcd3452b70
Remove bubble shaders
2014-11-20 22:05:19 +01:00
Tobias Markus
61ccfaac77
Fix errors in src/ that cppcheck yielded with the default configuration
2014-11-20 22:01:46 +01:00
Vincent Lejeune
a78b889b05
Modelise Beer Lambert absorption for fog
2014-11-20 21:23:33 +01:00
Flakebi
aecd9c4b80
Fix crash with --no-graphics
2014-11-20 21:22:58 +01:00
Marianne Gagnon
10ffb5411e
Filter OpenGL warnings to silence some unecessary noise
2014-11-19 19:31:49 -05:00
Vincent Lejeune
8356941986
Add missing counters
2014-11-20 01:05:10 +01:00
Marianne Gagnon
d776bee39a
Try to fix OSX fullscreen OpenGL profile
2014-11-19 18:43:55 -05:00
auriamg
93619555fc
Merge pull request #1718 from quizywiz/fixing1580
...
fix #1580
2014-11-19 18:31:34 -05:00
Vincent Lejeune
3f17a5c93d
Add another marker
2014-11-19 18:10:47 +01:00
Vincent Lejeune
5ef51d9c34
Prevent some rsm computation when not needed
2014-11-19 18:07:10 +01:00
Vincent Lejeune
d911a19b28
Do not fill RSM command buffer if rsm map not redraw
2014-11-19 17:58:55 +01:00
Vincent Lejeune
d3964b8a93
Draw RSM only once
2014-11-19 17:41:52 +01:00
Vincent Lejeune
ed2374ae05
Rotate suncam
...
It might improve shadow quality
2014-11-19 01:37:41 +01:00
Marianne Gagnon
5b043a2564
Add some debug logging on linux
2014-11-18 19:15:13 -05:00
Vincent Lejeune
c44ebcf8b5
Fixe shadow without sdsm
2014-11-19 00:51:09 +01:00
auriamg
76fc01a58f
Merge pull request #1720 from Flakebi/fpsCam
...
First person camera, fixes #1295
2014-11-18 17:58:28 -05:00
Flakebi
3e53787598
Smooth camera movement
2014-11-18 22:01:02 +01:00
quizywiz
98a7b6cfcb
fix 1580
2014-11-19 00:33:28 +05:30
Flakebi
497fa10695
First try of a fps camera
2014-11-18 11:55:32 +01:00
Vincent Lejeune
c594295288
Tweak shadow blur
2014-11-18 03:44:45 +01:00
Vincent Lejeune
dd0c98fd16
Use nearest sampling for shadow blur
2014-11-18 03:18:32 +01:00
Vincent Lejeune
29afd22b68
Smoothen shadow split
2014-11-18 03:13:39 +01:00
Vincent Lejeune
b7fc539f57
Add shadow scale parameters
2014-11-18 02:53:02 +01:00
Vincent Lejeune
b288d9c8c4
Fix overworld wrong shadow thx to Auria
2014-11-18 02:41:25 +01:00
Vincent Lejeune
64a64a963b
Make shadow condition more coherent
2014-11-18 01:53:02 +01:00
Vincent Lejeune
6781146f8a
Fix shadow on splatting
2014-11-18 01:45:28 +01:00
Marianne Gagnon
9d36ca74d6
tweak nitro light to be a bit less in-your-face
2014-11-17 19:20:22 -05:00
Marianne Gagnon
229a43a692
Preserve "startedFromOverworld" flag value properly. Fixes #1683
2014-11-17 19:07:37 -05:00
auriamg
af35bce41d
Merge pull request #1714 from Flakebi/fixes
...
Some minor fixes
2014-11-16 21:21:45 -05:00
Vincent Lejeune
eb2151b854
Check if ribbon is null
2014-11-17 01:11:50 +01:00
Vincent Lejeune
3cf3af57d8
Avoid using null pointer in feature_unlocked.cpp
2014-11-17 01:11:40 +01:00
Vincent Lejeune
7935df5dec
Actually it's _malloca not just malloca
2014-11-17 01:06:37 +01:00
Vincent Lejeune
8e3ee643d5
Fix using uninitialized memory
2014-11-17 00:11:23 +01:00
Vincent Lejeune
b7771642ca
Fix read overrun
2014-11-17 00:11:00 +01:00
Vincent Lejeune
2d39a41b76
Fix "Unprotected use of alloca"
2014-11-17 00:10:26 +01:00
Flakebi
ac5db6f28e
Fix #1708 Delete missmatch for currupted pngs
2014-11-17 00:08:47 +01:00
Flakebi
f1383d1a93
Deactivate some checkboxes without advanced pipeline
2014-11-17 00:08:47 +01:00
Flakebi
be999895b4
Remove some unused code
2014-11-17 00:08:47 +01:00
Flakebi
4ab84a6b83
Unify I18N attributes in screens
2014-11-17 00:08:47 +01:00
Vincent Lejeune
d34bdc2344
Fix null ref ptr static analysis
2014-11-16 23:24:50 +01:00
hiker
084ae89b55
Try to fix physics crash.
2014-11-17 08:44:21 +11:00
Flakebi
b8484d3576
Fix #966 Don't select a kart/keyboard configuration automatically in multiplayer
2014-11-16 22:35:03 +01:00
hiker
ad976e0d19
Fixed compilation.
2014-11-17 08:01:44 +11:00
hiker
65ee59788e
Fixed compiler warnings.
2014-11-17 08:01:26 +11:00
hiker
a2f59384f2
Fixed compiler warnings.
2014-11-17 07:59:53 +11:00
Vincent Lejeune
d5330a8f39
Fix VS2013 "dereferencing null ptr" static analysis error
2014-11-16 04:40:19 +01:00
Vincent Lejeune
8c20e7e8b2
Add begin/end for PtrVector
2014-11-16 03:36:06 +01:00
Vincent Lejeune
882cc0a02e
Revert "Try to rewrite ptr_vector"
...
This reverts commit 0966f30fe9 .
2014-11-16 03:20:16 +01:00
Vincent Lejeune
0966f30fe9
Try to rewrite ptr_vector
2014-11-16 03:16:39 +01:00
Vincent Lejeune
2016fc2ab2
Do not draw instanced first mesh if vertex type is wrong
2014-11-16 01:50:55 +01:00
Vincent Lejeune
1253893043
Fix for OSX
2014-11-16 01:48:40 +01:00
Marianne Gagnon
d8b0f79428
Tweak register script so that the "Online" checkbox is closer to the text
2014-11-15 18:38:51 -05:00
Vincent Lejeune
a65a241003
Merge remote-tracking branch 'origin/blurshadow'
2014-11-15 21:28:11 +01:00
Vincent Lejeune
c2859d24ce
Improved shadow stability
2014-11-15 21:27:15 +01:00
Vincent Lejeune
239a32b1d8
Add mipmap level for shadow
2014-11-15 21:19:17 +01:00
Vincent Lejeune
448f254a2b
Fixes
2014-11-15 21:02:24 +01:00
Vincent Lejeune
a7b8ba13cd
Add shader content
2014-11-15 20:43:44 +01:00
Vincent Lejeune
1970bc0ef5
Remove .project file
2014-11-15 20:40:39 +01:00
Vincent Lejeune
7e3c2c4897
Add a shader to blur shadow
2014-11-15 20:37:47 +01:00
Vincent Lejeune
687bb6e065
Spare a few lds inst
2014-11-15 19:18:07 +01:00
Vincent Lejeune
3c42223add
Try graphical restrictions on nvidia old drivers
2014-11-15 03:10:23 +01:00
hiker
8a60550e8b
Prevent online user names starting with 0-9 (for #1471 ).
2014-11-15 12:56:04 +11:00
hiker
92c51f5240
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-15 12:05:43 +11:00
hiker
be461b7a39
Try to fix crash at startup.
2014-11-15 12:05:14 +11:00
Vincent Lejeune
6cc721eaf9
Use CS for gaussian6
2014-11-15 01:11:26 +01:00
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
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
Deve
1a3ecf39fe
Fixed crash in track info screen after changing resolution.
...
Widgets after changing resolution are deleted, but TrackInfoScreen object and m_screenshot variable still exsist. Therefore check if it's not NULL isn't enough.
2014-11-14 21:07:12 +01:00
Marianne Gagnon
9fe93e21b9
make nitro emit light. The effect is not perfect yet, but already quite cool
2014-11-13 19:55:21 -05:00
auriamg
f81f1f92e3
Merge pull request #1649 from sachith500/ScriptCache
...
Script cache
2014-11-13 19:47:18 -05:00
Marianne Gagnon
c6651489c1
Tweak nitro for new engine
2014-11-13 19:24:15 -05:00
Vincent Lejeune
83d5c1e522
Prevent rendering too much point light scattering
2014-11-14 00:57:07 +01:00
Vincent Lejeune
e41ac3c7e5
Fix box particules starting at 0. 0. 0.
2014-11-13 23:37:13 +01:00
Deve
5c32aa8baa
Minor modifications for skidding and nitro.
...
Still could be better, I'm not an artist ;p
2014-11-13 19:24:53 +01:00
samuncle
595785b038
Re enable fog bluring was removed in the previous commit. IMHO without bluring the quality is just awful. The edges looks jagged and it seems we have no AA at all. If this is a performance issue we might need an option for that like: high quality blur. However in my test I didnt noticed a big difference in the framerate. Auria you might want to make better tests
2014-11-13 18:46:20 +01:00
samuncle
bd9823dbbe
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-11-13 18:02:49 +01:00
Vincent Lejeune
a6946e9b98
Remove extra blurring step in fog
2014-11-13 18:02:55 +01:00
samuncle
ffb76788a9
Minor tweak with transluscent material
2014-11-13 18:02:25 +01:00
hiker
22b6aaea25
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-13 22:47:05 +11:00
hiker
753c3d7168
Fixed #1638 (text overflows behind buttons) - partially by removing
...
the confirmation field for the emal address.
2014-11-13 22:42:32 +11:00
Deve
c1fd2d3614
Fixed skidding and nitro particles.
...
Not perfect but at least working.
2014-11-12 22:20:33 +01:00
Deve
91d26e92ef
A bit better rain.
2014-11-12 16:31:41 +01:00
hiker
c6d7da45e9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-12 19:27:43 +11:00
hiker
6f980b7605
Adding more btAsserts.
2014-11-12 19:14:59 +11:00
hiker
11b884eea4
Made '(handicap)' prefix translate-friendlier.
2014-11-12 18:45:34 +11:00
hiker
25b4d35a65
Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code
2014-11-12 15:45:03 +11:00
hiker
78e6a6a6b6
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-12 13:30:10 +11:00
hiker
157bc445b9
Added more asserts for #1678 .
2014-11-12 13:28:33 +11:00
hiker
f78c7e0779
Fixed compiler warnings.
2014-11-12 13:27:53 +11:00
hiker
28db99b7c1
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-12 12:26:00 +11:00
hiker
4b01d090c6
Fixed track name for GP.
2014-11-12 12:25:33 +11:00
samuncle
1bd3ee24c6
Add a description to the shader
2014-11-12 01:22:33 +01:00
samuncle
9857eb4621
Try to tweak the lens flare without being too obvious
2014-11-12 01:00:23 +01:00
samuncle
f39ae90b6e
merge with trunk + try to adapt to the new blur system
2014-11-12 00:08:21 +01:00
Vincent Lejeune
192ed8a486
Fix classic fog
2014-11-11 22:43:25 +01:00
Vincent Lejeune
09fa1ee3cb
Implement scattering for point light
2014-11-11 22:36:27 +01:00
hiker
8ac0bd6793
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-12 07:56:21 +11:00
Vincent Lejeune
b40cf6f321
tweak value
2014-11-11 21:56:13 +01:00
hiker
4cf93ca322
Fixed compiler warnings.
2014-11-12 07:55:55 +11:00
hiker
cbd43704ac
Added more asserts.
2014-11-12 07:53:24 +11:00
Vincent Lejeune
bd4fe57524
Use fog start value to determine density
2014-11-11 21:52:54 +01:00
Vincent Lejeune
84affec451
Change fog equation
2014-11-10 22:08:12 +01:00
Vincent Lejeune
85bbc0f8b8
Use variable sigma for blur filter
2014-11-10 21:32:04 +01:00
samuncle
b70f2cd176
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
2014-11-10 17:12:45 +01:00
deve
517c828738
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-11-10 12:59:27 +01:00
deve
322dec5419
Fixed mingw compilation in release mode.
2014-11-10 12:57:59 +01:00
hiker
b6b4636861
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-10 22:27:25 +11:00
hiker
ba55fd61dd
Disabled warning messages if the automatically created disabled
...
textures are not in the texture cache.
2014-11-10 22:26:29 +11:00
deve
65ee047b3c
Apply patch from upstream irrlicht which allow to compile it on windows using clang.
2014-11-10 11:33:49 +01:00
deve
98411b5568
Fixed compilation.
2014-11-10 10:32:26 +01:00
samuncle
d0caeb3b63
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
2014-11-10 06:51:10 +01:00
hiker
8dff64644a
Fixed #1687 (time too long when using many karts in ftl)>
2014-11-10 16:49:13 +11:00
hiker
5a1dc70a7a
Added some asserts to narrow down #1685 .
2014-11-10 16:40:50 +11:00
hiker
2c5430e66c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-10 16:33:37 +11:00
hiker
bfe7bff877
Fixed #1680 (notification shown at wrong place after changing resolution).
2014-11-10 16:32:35 +11:00
samuncle
7d71cabc92
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
2014-11-10 01:29:38 +01:00
Deve
387547cfda
Merge pull request #1684 from Alayan-stk/patch-1
...
Fix issue #1108
2014-11-09 21:18:37 +01:00
Alayan-stk
448a7eb94f
Fix issue #1108
2014-11-09 16:54:01 +01:00
Sachith Hasaranga Seneviratne
ebade1f3aa
Disabled callback for now
2014-11-09 18:33:11 +05:30
Sachith Hasaranga Seneviratne
d9b73907fe
Added basic line callback
2014-11-09 18:32:20 +05:30
Sachith Hasaranga Seneviratne
b7beff1406
Added map container for script cache
2014-11-09 17:35:01 +05:30
Sachith Hasaranga Seneviratne
f8cb8c75bb
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptCache
2014-11-09 14:55:46 +05:30
samuncle
eb18566f29
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
...
keep compatibility with master
2014-11-09 02:58:06 +01:00
Deve
144cdc8f68
Fixed file extension.
2014-11-08 21:05:11 +01:00
samuncle
e20d8bdcdf
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
...
Keep lens flare updated with trunk
2014-11-08 01:51:40 +01:00
hiker
5401e7f3b7
First try to prevent #1566 : kart chassis appears inside of terrain.
2014-11-08 11:43:06 +11:00
Vincent Lejeune
833f162d1a
Enable m_support_sdsm by default
2014-11-08 01:19:27 +01:00
Vincent Lejeune
04d313671c
Fix sqrt(int) in diffuseenvmap
2014-11-08 01:02:46 +01:00
Vincent Lejeune
5eefe0c0ad
Make envmap reflexion less blurry
2014-11-08 00:57:49 +01:00
samuncle
2a440bb2cb
minor modification to the blueish mood of lens flare
2014-11-07 16:20:39 +01:00
samuncle
1e547652f7
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
...
Keep lens flare updated with master
2014-11-07 16:14:11 +01:00
Vincent Lejeune
d7f3198ac9
Merge branch 'sdsm'
2014-11-07 13:42:29 +01:00
Vincent Lejeune
909948c9a4
Implement depth histogram to position cascade split
2014-11-07 13:42:13 +01:00
Vincent Lejeune
cacb008ae6
Prepare compute shader to stretch lightcoord
2014-11-07 13:42:13 +01:00
hiker
3c88898113
Fixed --camera-wheel-debug command line option (better distance
...
computation, no smoothing); removed unused function.
2014-11-07 16:36:03 +11:00
Marianne Gagnon
2c8f86fabd
Intro cutscene fixes
2014-11-05 18:13:47 -05:00
hiker
ce0d713dd3
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-05 23:25:29 +11:00
hiker
884daf9093
Fix #1665 (kart hovering in pyramid after jump) by only cushioning with
...
half the computed impulse.
2014-11-05 22:53:25 +11:00
hiker
cfb4dc13a8
Updated GP for new mines track.
2014-11-05 13:39:57 +11:00
hiker
2077676f8e
Updated windows build instructions.
2014-11-05 11:23:46 +11:00
Flakebi
9dd86c8332
Don't handicap AIs
2014-11-04 23:57:33 +01:00
Flakebi
5a84b471e4
Add 'handicapped' to player name
2014-11-04 23:36:16 +01:00
samuncle
52bc4cebd4
Add the lensflare shader
2014-11-04 21:15:18 +01:00
samuncle
bea2586af3
Preparing lens flare branch
2014-11-04 21:12:26 +01:00
Vincent Lejeune
92ecd01e61
Make cascade split modifiable
2014-11-04 20:53:32 +01:00
Deve
6d07189474
Don't allow doubled tracks in random GP.
...
Otherwise track number limit wouldn't have sense.
2014-11-04 20:27:01 +01:00
Deve
66a1ff2b2b
Don't allow to run locked tracks in random GPs
2014-11-04 20:10:36 +01:00
Deve
e27e7a0132
Reset kart rotation when skidding is broken by rescue animation.
...
Minor improvements with breaking during skidding.
2014-11-04 11:27:07 +01:00
Vincent Lejeune
3eafdd9729
Culling was wrongly disabled
2014-11-04 02:06:17 +01:00
Vincent Lejeune
2f4edb6183
Higher value for zmin
2014-11-04 01:55:10 +01:00
Vincent Lejeune
c93e6c0ee3
Fix shadow glitches in minigolf
2014-11-04 01:48:50 +01:00
Marianne Gagnon
aeed2618a4
Set anisotropic filtering to 16 on highest graphical level, fixes #1655
2014-11-03 17:47:07 -05:00
samuncle
d7caebe847
enable vignette during races
2014-11-03 21:53:44 +01:00
Deve
3cec4b25fb
Set jump animation only if any other animation os not used.
...
It avoids to break eg. win/lose animation.
Remove unused variable.
2014-11-03 16:49:44 +01:00
Deve
0e126f7533
Merge pull request #1657 from tobbi/fix_mac_compilation
...
Fix mac compilation (syntax error)
2014-11-03 14:31:20 +01:00
Tobias Markus
1e384ebb52
Fix mac compilation (syntax error)
2014-11-03 13:55:22 +01:00
Deve
01a7094cd8
Don't show jump animation during rescue
2014-11-03 13:32:23 +01:00
hiker
18bcb92afc
Used better variable name.
2014-11-03 21:36:54 +11:00
hiker
150941aad2
Maintain a flag that indicates if the gamepad device name is 'useful'
...
(on windows we might get a dummy name, identical for all gamepads).
Only add a number to the gamepad if the device has a useless default
name.
2014-11-03 16:37:19 +11:00
hiker
dec5ac8aa2
Fixed several xml errors (unclosed <space> tags).
2014-11-03 15:25:39 +11:00
hiker
ce488aa98f
Removed duplicated A/B handling for xbox/classic xbox; use "thumb button"
...
instead of "stick button", and more switch instead of if.
2014-11-03 13:51:54 +11:00
hiker
e488b61b62
More fixes for classic xbox controller.
2014-11-03 13:43:50 +11:00
hiker
d2d665b449
More fixes for classic xbox controller.
2014-11-03 13:34:23 +11:00
hiker
467bc6b34b
Try to improve xbox classic controller support.
2014-11-03 13:18:45 +11:00
hiker
ff5c3ac65e
Try to identify old xbox controllers.
2014-11-03 12:45:19 +11:00
Vincent Lejeune
17aafae42c
Merge remote-tracking branch 'origin/esm'
2014-11-03 01:02:27 +01:00
Vincent Lejeune
f2da00954d
Check if textureview is available before filtering
2014-11-03 00:57:07 +01:00
Vincent Lejeune
e5b269949a
Use polygon offset
2014-11-03 00:49:52 +01:00
Vincent Lejeune
70f53a0e51
Revert "Reenable again culling for shadows"
...
This reverts commit 61dd0fdc60 .
2014-11-03 00:48:29 +01:00
Vincent Lejeune
61dd0fdc60
Reenable again culling for shadows
2014-11-03 00:29:44 +01:00
hiker
841ae8814e
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-03 08:56:19 +11:00
hiker
3f74ed3911
Fixed compiler warnings.
2014-11-03 08:56:01 +11:00
hiker
2462aef75a
Fixed compiler warnings and coding style issues.
2014-11-03 08:55:20 +11:00
hiker
d20441d45e
Modified to trigger automatic cmake run.
2014-11-03 08:34:47 +11:00
hiker
fa680e8903
Merge branch 'Flakebi-perPlayerDifficulties'
2014-11-03 08:33:51 +11:00
hiker
ed10b022d2
Use a group for handicap related config settings.
2014-11-03 08:32:35 +11:00
hiker
62b81b3e9a
Shortened labels to fit on smaller screens.
2014-11-03 08:23:35 +11:00
hiker
0be0d7ee72
Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code into Flakebi-perPlayerDifficulties
2014-11-03 06:52:31 +11:00
Vincent Lejeune
ddecd23472
Tweak values
2014-11-02 19:07:02 +01:00
Vincent Lejeune
ebe11370a2
Reenable bluring
2014-11-02 16:30:44 +01:00
Vincent Lejeune
c5186e3ab3
Use depth in exp space
2014-11-02 16:26:46 +01:00
Vincent Lejeune
b975b63eea
Use proper depth linear value
2014-11-02 16:00:41 +01:00
hiker
6f46f5a8b3
Support for gamepad-specific button/axis names. Added name for xbox
...
controller.
2014-11-02 23:13:49 +11:00
Vincent Lejeune
f5a44c0a19
Take more sample
2014-11-02 02:42:44 +01:00
Vincent Lejeune
1ecd8dcf4f
Fix moiré pattern
2014-11-02 02:37:20 +01:00
Vincent Lejeune
f4e0437106
Fix textureview
2014-11-02 02:37:19 +01:00
Vincent Lejeune
6bf5c13bde
Implement shadow blur
2014-11-02 02:37:19 +01:00
Vincent Lejeune
57b6d8e415
Revert "Use MSAA for shadowmap"
...
This reverts commit fce9fe4385aa488a6f02814790022828d5e8f8bf.
Conflicts:
src/graphics/render_geometry.cpp
src/graphics/rtts.cpp
2014-11-02 02:37:18 +01:00
Vincent Lejeune
cedbb32a17
Try to fix incomplete fbo attachement
2014-11-02 02:37:17 +01:00
Vincent Lejeune
4e6a7b5192
Use MSAA for shadowmap
2014-11-02 02:37:17 +01:00
Vincent Lejeune
937eb3baf8
Add trilinear + anisotropic on shadows
2014-11-02 02:37:16 +01:00
Vincent Lejeune
9113aa7a39
Implement Exponential Shadow map
2014-11-02 02:36:10 +01:00
Vincent Lejeune
7679213e26
Use exp algorithm for the gaussian blur
2014-11-02 02:35:02 +01:00
auriamg
042817a760
Merge pull request #1653 from tobbi/fix_mac_linking
...
Fix linking on OSX
2014-11-01 21:09:53 -04:00
Vincent Lejeune
8588720f6b
Add a check for instance buffer overflow
2014-11-02 01:00:10 +01:00
Vincent Lejeune
5557a0165a
Fix rtt crash
2014-11-02 00:21:54 +01:00
auriamg
7d06cfa2d0
Merge pull request #1652 from tobbi/fix_mac_compilation
...
Fix compilation on OSX 10.10
2014-11-01 18:53:23 -04:00
Tobias Markus
53339cf417
Fix linking on OSX
2014-11-01 22:55:19 +01:00
Vincent Lejeune
6aed902ae0
Store depth in color buffer instead of depth
...
This allows for instance to blur it using already existing shaders
2014-11-01 22:38:38 +01:00
Tobias Markus
4861a52c3f
Fix compilation on OSX 10.10
...
Closes #1646
2014-11-01 22:22:58 +01:00
hiker
f2e33b1000
Fixed compilation (accidentally added some wip code).
2014-11-01 12:27:09 +11:00
hiker
9f0d1f00ea
Inreased default deadzone to 4096.
2014-11-01 12:22:20 +11:00
hiker
6a296aab62
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-01 12:13:44 +11:00
hiker
15e712ba49
iFix #960 : impossible to configure xbox controller. The xbox controller
...
can have a rather huge deadzone, which prevent detection when a axis
was released.
2014-11-01 11:58:04 +11:00
Vincent Lejeune
b80ecb48f4
Merge branch 'cullingdebug'
2014-11-01 00:21:26 +01:00
Vincent Lejeune
aba6c00fc6
Add profiler
2014-11-01 00:12:54 +01:00
hiker
8aac6ca6d0
For now comment out debug messages.
2014-11-01 09:54:21 +11:00
hiker
62ef836e7c
Bugfixes: set number of buttons in the configuration (since it is
...
not saved in the config file), use floating point in desensitizing.
2014-11-01 09:53:13 +11:00
hiker
b992375c58
Added missing initialisation.
2014-11-01 09:51:42 +11:00
Vincent Lejeune
b95fb6d030
Do some kind of hierarchical culling
2014-10-31 23:39:06 +01:00
Vincent Lejeune
7489c7bceb
Use classic scene manager parsing for cull algorithm
2014-10-31 23:38:59 +01:00
Vincent Lejeune
979d872fe0
Remove quick culling
...
Sometimes it returns wrong results
2014-10-31 23:29:42 +01:00
Vincent Lejeune
cf18a8ee20
Display bounding boxes
2014-10-31 23:29:41 +01:00
Marianne Gagnon
9c9c4d2fcf
bugfix: auto-calculate tangents for static-mesh too
2014-10-31 23:29:40 +01:00
Flakebi
9ca1c03480
Applying merges correctly is difficult...
2014-10-31 18:54:52 +01:00
Flakebi
abf7bacfea
Merge branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
src/graphics/stkmesh.cpp
src/states_screens/kart_selection.cpp
2014-10-31 16:47:34 +01:00
Sachith Hasaranga Seneviratne
ebb914d0ef
Added basic caching for scripts
2014-10-31 16:23:56 +05:30
hiker
98c8985739
Removed unused constants.
2014-10-31 21:06:26 +11:00
Sachith Hasaranga Seneviratne
9822234fc5
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptCache
2014-10-31 15:28:05 +05:30
hiker
e9e5cab164
Added option to 'desensitze' joysticks, i.e. make it less sensible
...
at values close to 0.
2014-10-31 16:32:39 +11:00
hiker
22441c1fd8
Forgot to add isAnalog() function for gamepads.
2014-10-31 16:19:31 +11:00
hiker
b56280761f
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-31 15:32:26 +11:00
hiker
e2d17bcf88
Added 'isAnalog' functionality to avoid that gamepads on full left/right
...
steering will delay steering because of time-full-steer. Added some
virtual destructors.
2014-10-31 15:18:26 +11:00
hiker
086705ab3e
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-31 12:30:44 +11:00
hiker
c72ff275ec
CURRENT can not be defined as result of or-ing the values, since the
...
values are not bit masks.
2014-10-31 12:29:15 +11:00
Vincent Lejeune
a54d03377b
Remove quick culling
...
Sometimes it returns wrong results
2014-10-31 02:16:23 +01:00
Vincent Lejeune
6ea56bb974
Display bounding boxes
2014-10-31 01:46:35 +01:00
Marianne Gagnon
6429d394e5
bugfix: auto-calculate tangents for static-mesh too
2014-10-30 19:57:03 -04:00
hiker
ca6a0accaa
Fixed compilation in release mode.
2014-10-31 09:14:18 +11:00
hiker
4986deebd6
Removed number of axes and buttons from GamepadDevice, and use the
...
values from GamepadConfig instead.
2014-10-31 08:16:15 +11:00
hiker
e9980fcb2f
Completely removed device type, instead use isGamePad() and
...
isKeyboard().
2014-10-30 17:43:50 +11:00
Marianne Gagnon
aac454f846
Fix bug in feature unlocked screen, improve error message
2014-10-29 20:07:01 -04:00
Vincent Lejeune
ee687440c7
Increase shadow filtering
2014-10-29 18:57:39 +01:00
Sachith Hasaranga Seneviratne
2c70eb5cc7
Remove unnecessary engine releases within script engine lifetime
2014-10-29 17:42:58 +05:30
deve
ab82e3f62a
Fixed cmake warning.
...
Angelscript is not separated project, but static library.
2014-10-29 09:30:03 +01:00
hiker
25bbc06109
Made m_type in DeviceConfig private.
2014-10-29 16:41:26 +11:00
hiker
ce9cfa3bc8
Removed unnecessary #include.
2014-10-29 16:41:04 +11:00
hiker
7b809636d4
Made m_plugged and m_name in DeviceConfig private.
2014-10-29 16:37:27 +11:00
hiker
0264677750
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-29 15:44:24 +11:00
hiker
721c8bfa88
Made m_enabled in DeviceConfig private.
2014-10-29 15:44:05 +11:00
Marianne Gagnon
09953e622e
Fix crash
2014-10-28 20:09:20 -04:00
Vincent Lejeune
25c017b5fd
Reenable normal visualisation
2014-10-29 00:40:30 +01:00
Marianne Gagnon
bf0f75a367
Fix (again) initial scattering of now so that it falls evenly
2014-10-28 19:06:29 -04:00
Vincent Lejeune
40932fadeb
Make resolution change more robust
2014-10-28 23:43:41 +01:00
Vincent Lejeune
cd74ee0d87
Use correct sampler for azdo mode for rubber band
2014-10-28 23:19:42 +01:00
vlj
93d03c53b9
Merge pull request #1644 from tobbi/fix_mac_compilation
...
Add default constructor to class Tuple<>, fixes issue #1643
2014-10-28 22:42:13 +01:00
hiker
29f5b14e45
More refactoring. Created factory for DeviceConfigs.
2014-10-29 08:22:25 +11:00
Arthur-D
6c0ace85ee
Slight improvement on notification backgrounds. Feedback welcome.
2014-10-28 07:16:29 +01:00
hiker
92196c7534
Made processAndMapInput a pure virtual function of InputDevice, which
...
is implemented in Keyboard- and GamepadDevice.
2014-10-28 17:04:00 +11:00
hiker
9d5fd13ae9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-28 16:10:16 +11:00
hiker
ab915b20a3
Use toIrrVector().
2014-10-28 16:00:28 +11:00
Vincent Lejeune
891330a8f3
Do fast culling inside precise culling
2014-10-28 01:40:02 +01:00
hiker
39b8f79f9f
Fixed conflicts with my refactoring work.
2014-10-28 10:14:38 +11:00
hiker
a0b7b1003d
More work on refactoring input devices (still wip).
2014-10-28 10:14:04 +11:00
hiker
891b0697dc
Fixed compilation on VS.
2014-10-28 10:13:44 +11: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
Tobias Markus
1acfc4a878
Add default constructor to class Tuple<>, fixes issue #1643
2014-10-27 23:12:07 +01:00
hiker
9e9ce47a2b
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-28 09:02:35 +11: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
9d06c276b2
Removed unnecessary line breaks.
2014-10-27 17:03:41 +11:00
hiker
bb24585229
Fixed error in xml writing.
2014-10-27 17:03:16 +11:00
hiker
3235633bbc
Fixed copy&paste error.
2014-10-27 16:56:27 +11:00
hiker
a14423ac2a
Bugfix: the number '4' would not be displayed correctly if used
...
as input key.
2014-10-27 16:55:49 +11:00
hiker
99f69f4070
Moved KeyboardConfig and GamepadConfig from DeviceConfig to their
...
own separate files.
2014-10-27 13:26:52 +11:00
Marianne Gagnon
32c5d79e26
World : do not self-destruct until everything completely done
2014-10-26 19:05:07 -04:00
Flakebi
f27597c450
Revert "Fix incorrect alignment in spinner widgets"
...
This reverts commit 4cb8be6ab4 .
2014-10-26 18:02:28 +01:00
Flakebi
46f3fa5f74
Merge branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
data/gui/options_ui.stkgui
src/graphics/stkmesh.cpp
src/states_screens/options_screen_ui.cpp
2014-10-26 17:47:29 +01:00
Flakebi
4cb8be6ab4
Fix incorrect alignment in spinner widgets
2014-10-26 17:10:28 +01:00
Flakebi
690e632e1b
Move handicap to ui options and to the player name spinner
2014-10-26 16:56:50 +01:00
Arthur-D
ef2cf3b17d
Sorry for the previous messy merge - no files were changed remotely so should be safe. Due to my mishap I need to commit the files I wanted to again. Those are new bg images for achievement and friend notifications. Feedback welcome.
2014-10-26 15:34:51 +01:00
Arthur-D
4ed59d8a4d
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-26 14:10:31 +01:00
hiker
e8f509eefe
Moved DeviceConfig from config to input directory.
2014-10-26 23:26:02 +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
hiker
d63a5dba45
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-25 10:36:19 +11:00
hiker
d8cb6e1069
Moved #include to the top.
2014-10-25 10:32:28 +11:00
Marianne Gagnon
047c6fc760
Add debug name to meshes and mesh buffers, helps debugging
2014-10-24 19:25:24 -04:00
hiker
759182bb68
Used SDL's joystick name detection on windows.
2014-10-25 10:18:27 +11:00
hiker
1cd5ffd484
Fixed compiler warning.
2014-10-24 21:48:14 +11:00
hiker
6893e94e71
Replaced irrXML usage with out XMLNode.
2014-10-24 21:47:50 +11:00
hiker
2d5af3bee8
Change the text of the login name dynamically (i.e. from local
...
name to online name).
2014-10-24 16:52:37 +11:00
hiker
d1f68ca480
Go to the user screen when clicking on the user button.
2014-10-24 14:00:51 +11:00
hiker
f7893afbef
Adjusted button position, thanks to auria.
2014-10-24 11:16:08 +11:00
hiker
b5db6f3270
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-24 10:35:55 +11:00
hiker
8bc6aa91bb
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-24 10:34:59 +11:00
hiker
1920703f09
Converted label to button, just for tests.
2014-10-24 10:34:10 +11:00
hiker
f6aa05ec1c
Modified to trigger automatic rerun of cmake.
2014-10-24 10:30:23 +11:00
hiker
3372d06759
Removed unused files.
2014-10-24 10:22:27 +11:00
Vincent Lejeune
794ab54b7a
Clamp lodval
2014-10-24 00:41:34 +02:00
hiker
b4f95d672a
Started to indicate the name of the logged in user ... still work in
...
progress (black writing on dark grey).
2014-10-23 22:26:11 +11:00
hiker
f70687a00b
Minor cosmetic changes only.
2014-10-23 22:25:23 +11:00
hiker
6e79f90166
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-23 08:34:47 +11:00
hiker
efe64f4a67
Engine is no longer disabled after a kart-kart collision.
2014-10-23 08:21:54 +11:00
hiker
2cad89ceeb
iFix #1617 (no sfx on hitting the track).
2014-10-23 08:03:15 +11:00
Arthur-D
e7ef83aea8
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-22 22:14:20 +02:00
Vincent Lejeune
7d602225fb
Use InitTexture for transparents too
2014-10-22 22:05:09 +02:00
Vincent Lejeune
d0b996ab4a
Use template defined SetTexture argument sets instead of vector
2014-10-22 21:51:11 +02:00
Vincent Lejeune
9ca4d7e3e6
Improve ibl specular reflexion using mipmap chain
2014-10-22 14:49:06 +02:00
hiker
86b8036926
Fix #1631 (SFX can not be enabled in in-race game menu).
2014-10-22 17:16:39 +11:00
hiker
9e76a81bfd
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-22 09:42:42 +11:00
Vincent Lejeune
bdb98d6380
remove nested np.sum
2014-10-22 00:40:58 +02:00
Vincent Lejeune
de09937f88
Algorithm for diffuse coeff implemented in py
2014-10-22 00:17:32 +02:00
hiker
69c155063a
Added Yes/No dialog box, and used it for the 'allow STK to connect
...
to internet' question.
2014-10-22 09:15:42 +11:00
Vincent Lejeune
7d22a5961d
Vectorize solid angles a little more
2014-10-21 23:37:48 +02:00
Vincent Lejeune
82610cc048
Normalize terms in computeYmlOnGrid
2014-10-21 23:32:45 +02:00
Vincent Lejeune
d9ea756b15
Add function for solid angle
2014-10-21 23:28:01 +02:00
hiker
c012e98f9b
Allow disabling of hw stats collection.
2014-10-22 08:20:26 +11:00
hiker
690ad4ce95
Fixed sfx direction.
2014-10-21 22:07:22 +11: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
d3ba39b130
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-21 09:49:21 +11:00
Vincent Lejeune
2e27d8724a
Add a script that computes IBL factors
2014-10-21 00:35:25 +02:00
hiker
98a10d5614
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-21 08:49:03 +11:00
hiker
8d9f1aa002
Renamed SoundToggled to toggleSound.
2014-10-21 08:48:21 +11:00
Deve
04933af4b0
Redrawing GP info screen is not needed now.
2014-10-20 23:46:25 +02:00
Deve
321f0e7078
Remove saved GP when we start new race.
...
Avoid a crash. Saved GP was deleted, but was not NULL. And in other place we have if(m_saved_gp != NULL) check, which was true for deleted object.
2014-10-20 23:46:25 +02:00
konstin
4647a50acb
Save GP on abort
2014-10-20 23:46:25 +02:00
konstin
f65ad8f84f
Save GP reverse Type; close #1137
2014-10-20 23:46:25 +02:00
konstin
035fc599ee
fix ordering of the karts and maybe some more
2014-10-20 23:46:25 +02:00
konstin
ae24c6b40f
only one saved GP per GP-ident
...
Conflicts:
src/graphics/glwrap.cpp
2014-10-20 23:46:25 +02:00
hiker
65b7589849
Make sure the sfx are resumed before calling onSOundEnbaledBack().
2014-10-21 08:31:10 +11:00
hiker
c7d7e17ff9
Handle setMasterVolume in sfx thread.
2014-10-21 08:28:41 +11:00
hiker
a09c1346b7
Fixed sound objects.
2014-10-21 08:21:58 +11:00
Flakebi
57afd1d585
Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch...
...
Conflicts:
data/gui/user_screen.stkgui
data/gui/user_screen_tab.stkgui
src/graphics/glwrap.cpp
src/graphics/weather.cpp
src/states_screens/user_screen.cpp
2014-10-20 22:36:54 +02:00
Flakebi
71b8ba4d43
Merge branch 'master' into perPlayerDifficulties
...
Conflicts:
src/guiengine/widget.hpp
src/guiengine/widgets/progress_bar_widget.cpp
2014-10-20 22:27:34 +02:00
hiker
9dff5a7990
Fix potential memory overwrite in soccer mode when using one player
...
only (artist debug mode).
2014-10-20 23:01:31 +11:00
hiker
8b7bf28e0f
Fixed #1147 - sounds should stopped when they are disabled in option screen.
...
Fixed by explicitely stopping all non-looped sfx.
2014-10-20 22:37:19 +11:00
hiker
07c37539fd
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-20 09:43:40 +11:00
hiker
36ea7f30bf
Only restart sfx if they were really paused.
2014-10-20 09:43:05 +11:00
Vincent Lejeune
f3dd009376
Try to fix model loader hpp
2014-10-19 18:44:08 +02:00
Vincent Lejeune
4ee0e24ff7
Try to fix travis build.
2014-10-19 16:40:27 +02:00
Vincent Lejeune
b13e6931ce
Revert "Try to fix travis build."
...
This reverts commit 3ea954cc73 .
2014-10-19 16:39:39 +02:00
hiker
3ea954cc73
Try to fix travis build.
2014-10-20 00:48:15 +11:00
hiker
11dbb6f062
Fixed some warnings printed when sfx are disabled.
2014-10-20 00:05:48 +11:00
Marianne Gagnon
9b46cdc981
Refactor library nodes to be proper TrackObjects, allows animating them with curves
2014-10-18 19:11:24 -04:00
Vincent Lejeune
e23aba65f4
Move shader load code to shader.cpp instead of glwrap.hpp
2014-10-18 23:53:16 +02:00
Vincent Lejeune
80c7c5e49b
Remove unused functions
2014-10-18 18:29:37 +02:00
Vincent Lejeune
95cf6c5f4a
Put 2d function in their own header
2014-10-18 18:16:50 +02:00
Vincent Lejeune
5efea6fd1a
Factorise attribute binding function
2014-10-18 17:59:30 +02:00
hiker
c40a8eb377
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-18 23:44:11 +11:00
hiker
650b541def
Try to fix #1622 (can't login due to a missing password entry field).
2014-10-18 23:43:27 +11:00
Vincent Lejeune
e165398fdd
Fix texture
2014-10-18 04:10:59 +02:00
hiker
3082267eb4
Properly test for sfx disabled, and only schedule events if sfx
...
are enabled. Fixes #1629 .
2014-10-18 12:11:02 +11:00
hiker
df5635e90f
Fixed typo in warning message.
2014-10-18 12:10:27 +11:00
hiker
02435e4977
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-18 11:47:20 +11:00
hiker
19f9afb67f
Manually keep track of the duration each sfx has been played (instead
...
of relying on the world clock, which can run backwards, e.g. in
FTL mode). Fixes #1624 .
2014-10-18 11:46:22 +11:00
Marianne Gagnon
acc90fd03c
Don't let irrlicht process tab events. FIxes #1619 , fixes #1225 , fixed #1454
2014-10-17 19:39:38 -04:00
Marianne Gagnon
c95e90b925
Tweak checkbox position on login screen
2014-10-17 19:24:21 -04:00
Vincent Lejeune
2f45266c6f
Fix position of speedmeter
...
Only need to get the texture
2014-10-17 18:51:41 +02:00
Vincent Lejeune
ce7f017adf
Some fixes
2014-10-17 18:43:39 +02:00
Vincent Lejeune
f67f207d4b
Start fixing speedmeter
2014-10-17 18:19:23 +02:00
hiker
3694758f56
Removed debug output.
...
Conflicts:
src/audio/sfx_manager.cpp
2014-10-17 16:54:44 +11:00
hiker
7103ea8e88
Throttle sfx command if the queue should get too long (might need some
...
tuning). Non-essential sfx (positioning, speed, looping, and play)
are discarded.
2014-10-17 16:53:44 +11:00
hiker
0a39842b04
Throttle sfx command if the queue should get too long (might need some
...
tuning). Non-essential sfx (positioning, speed, looping, and play)
are discarded.
2014-10-17 16:49:14 +11:00
hiker
403702d6bb
Handle pauseAll and resumeAll completely in thread now. Avoids a crash
...
(caused by pauseAll trying to pause a sfx that is still in the list of
all sfx, but has a delete command already queued up).
2014-10-17 16:26:15 +11:00
hiker
383cbef14d
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-17 12:04:04 +11:00
hiker
c7f37297b1
Fixed potential deadlock (if a sfx is not found in the queue, which shouldn't
...
happen); stop sounds which are deleted only once, slightly reduce size of
locked region.
2014-10-17 12:02:23 +11:00
hiker
813edc7ddf
Remove SFX_INITIAL state.
2014-10-17 12:00:00 +11:00
Marianne Gagnon
1bd9fc0423
Fix mesh tangents caching
2014-10-16 18:40:49 -04:00
Marianne Gagnon
bf5c77d061
Merge branch 'master' into TangentsCaching
2014-10-16 18:20:23 -04:00
hiker
a40d6d8a00
Removed isPlaying function, and use getStatus instead.
2014-10-17 08:27:40 +11:00
Deve
3499975b03
Move track name to center.
...
It allows a bit longer track names and looks better.
2014-10-16 19:33:54 +02:00
hiker
3d15f13c74
iFixed #1624 (though it is a bit of a hack).
2014-10-16 23:45:09 +11:00
hiker
6dc36b6096
Merge branch 'quizywiz-master'
2014-10-16 22:51:18 +11:00
hiker
31c4b2c475
Merge branch 'master' of https://github.com/quizywiz/stk-code into quizywiz-master
2014-10-16 22:47:46 +11:00
hiker
014bc73940
Don't create a sound effect for AIs if its volume is set to 0.
2014-10-16 21:46:31 +11:00
Deve
9921c742e3
Merge pull request #1621 from marcoll/master
...
Use length limit for dynamic ribbon labels in the GP editor
2014-10-16 08:30:34 +02:00
hiker
662200371a
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-16 17:17:26 +11:00
hiker
4bb1091f3e
Moved sfx thread update to happen after graphics code is finished.
...
This improves performance since threads in graphics code do not
compete with threads in sfx handling anymore.
2014-10-16 17:11:15 +11:00
hiker
e4e0724cb9
Removed unnecessary stop of music (music will stop anyway once the
...
buffer is finished, but if music is completely threaded it might
just keep on playing).
2014-10-16 17:03:13 +11:00
hiker
a18766e3e6
Handle looping in sfx thread.
2014-10-16 16:57:12 +11:00
hiker
4edcf6169b
Removed debug code.
2014-10-16 12:55:59 +11:00
hiker
c61b7d632d
Fix stk hanging on exit.
2014-10-16 12:48:48 +11:00
hiker
8a89ce5161
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-16 12:47:45 +11:00
hiker
1f87dbb94e
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-16 09:12:19 +11:00
hiker
0cccb5f1d5
Fixed typo.
2014-10-16 09:11:56 +11:00
hiker
140ea5ed84
Update comments.
2014-10-16 08:21:26 +11:00
hiker
aae834ba4b
Run the music manager from the sfx thread.
2014-10-16 08:13:55 +11:00
hiker
09f8ffb16e
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-16 07:40:43 +11:00
hiker
bba7156aff
Handle the setting of the listener position in the sfx thread.
2014-10-15 23:42:59 +11:00
hiker
7e4e857b41
Improve situation of #1624 - it should only happen now if you pause the
...
game in the first one or two seconds after start (still wip).
2014-10-15 23:38:13 +11:00
Marianne Gagnon
3fe2870c39
Cleaner fix for #1626 , closes #1626
2014-10-14 20:03:50 -04:00
Marianne Gagnon
514d0c4dfe
Work around #1626
2014-10-14 19:59:42 -04:00
Arthur-D
c45f6a1133
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-14 23:21:58 +02:00
hiker
607e94ea84
Fixed #1622 (missing password field in login screen).
2014-10-15 08:20:06 +11:00
hiker
eec19b0703
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-15 07:56:50 +11: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
quizywiz
6dd9feff36
escape or back on friends profile takes you to your profile
...
Also, fixed bug where user info dialog was accessing m_enter_profile
after it was deleted
2014-10-14 12:07:08 +05:30
hiker
c18579d86a
Fixed compiler warning.
2014-10-14 09:57:53 +11:00
hiker
22633aa363
Avoid calling querying the openal status in getStatus (which causes
...
a slowdown of sfx).
2014-10-14 09:01:26 +11:00
hiker
d753fab7db
Removed debug output.
2014-10-14 09:01:13 +11:00
hiker
665f146923
Moved SFXStatus enum to SFXBase.
2014-10-14 08:05:04 +11:00
Marc Coll Carrillo
26b286ab9c
Merge remote-tracking branch 'upstream/master'
2014-10-13 18:00:59 +02:00
hiker
5cf7b0dca9
Added computation of the duration of a sound buffer (unused atm).
2014-10-13 22:06:05 +11:00
hiker
f84e773738
Removed status check when queueing sfx, to get more consistent
...
runtime behaviour.
2014-10-13 22:04:46 +11:00
hiker
0b691ba3e8
Merge remote-tracking branch 'origin/master'
2014-10-13 16:40:53 +11:00
hiker
e5315c7583
Merge branch 'marcoll-master'
2014-10-13 16:38:30 +11:00
Marianne Gagnon
2b90cb2a69
Use case-insensitive comparison for animated textures, for some reason
2014-10-12 20:12:40 -04:00
hiker
c5434aa845
Merge branch 'master' of https://github.com/marcoll/stk-code into marcoll-master
2014-10-13 09:55:25 +11: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
Marc Coll Carrillo
f0429ce95e
Use length limit for dynamic ribbon labels in the GP editor
2014-10-11 10:50:06 +02:00
hiker
216575a732
Started to let all sfx related command be executed from the sfx manager
...
to avoid race condition and crashes.
2014-10-11 11:55:02 +11:00
Marc Coll Carrillo
c159f1fca2
Merge remote-tracking branch 'upstream/master'
2014-10-10 22:39:55 +02:00
hiker
4dc817890b
Reverted 77bd4140a8 (which caused
...
crash and other sfx to be played only once).
2014-10-10 23:50:27 +11:00
Arthur-D
8d6daf8e14
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-10 13:18:00 +02:00
hiker
77bd4140a8
Replaced more getStatus() functions.
2014-10-10 16:48:21 +11:00
hiker
61068c7278
Replaces sfx->getStatus with isPlaying() functi n which is faster
...
(for #1511 ).
2014-10-10 16:45:29 +11:00
hiker
6dc18a3557
Change "Cancel" to 'Exit game' and make the back arrow invisible if
...
the login screen is shown before the race start.
2014-10-10 16:19:25 +11:00
hiker
8d587ab8f1
Fixed windows compilation.
2014-10-10 09:54:57 +11:00
hiker
a5ad78654e
Remove data after "-" when using uname (which could theoretically be
...
used to identify a system).
2014-10-10 09:40:19 +11:00
hiker
3877bf1dab
Added support for detecting BSD versions; added uname based fallback
...
on linux in case /etc/*release does not find valid info.
2014-10-10 09:21:15 +11:00
hiker
5d019e3537
Don't show a password entry field for the currently logged in user.
2014-10-10 07:57:10 +11:00
hiker
f39e2d9cdf
Actually display secret achievements once they have been achieved.
2014-10-10 07:49:14 +11:00
hiker
50c21cc11e
Added secret achievement (i.e. progress not shown in list).
2014-10-09 23:32:17 +11:00
deve
08c8de1986
Fixed missing quotes
2014-10-09 07:07:16 +02:00
auriamg
3061123e3e
Merge pull request #1606 from Flakebi/fix
...
Fix some more bugs
2014-10-08 18:18:37 -04:00
Arthur-D
b711a9949a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-08 21:06:24 +02:00
deve
6a62eaec9c
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-08 14:49:15 +02:00
deve
f8de826888
Fixed compiler warnings
2014-10-08 14:44:05 +02:00
hiker
8495dbfd27
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-08 23:17:04 +11:00
hiker
30413b8d6d
Fix loss of associated online user name if stk is played offline
...
(might be a fix for #1595 ).
2014-10-08 23:14:43 +11:00
deve
95483268cf
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-08 14:04:38 +02:00
deve
d5faa23e0c
Use CMAKE_CXX_FLAGS instead of add_definitions for additional flags
2014-10-08 14:03:23 +02:00
hiker
029c33c276
Avoid writing the players.xml file multiple time at the exit time.
2014-10-08 22:53:34 +11:00
hiker
bc7d8f6103
Fixed compiler warning.
2014-10-08 22:49:32 +11:00
deve
f11b482576
Use stringstream instead of visual studio specific sscanf_s
2014-10-08 07:07:27 +02:00
Vincent Lejeune
ea3cc141ff
Fix grass in azdo mode
2014-10-08 01:01:28 +02:00
Vincent Lejeune
5b2d334b8c
Grass mat should use glossmap too
2014-10-08 00:50:18 +02:00
hiker
17fd8df935
Fixed assert statement.
2014-10-08 08:25:42 +11:00
hiker
4ff00018b4
Fixed alignment of password field.
2014-10-08 08:25:00 +11:00
hiker
d5bc5ec110
Fix #1605 : crash when downloading friends and achievements at the same time.
2014-10-08 08:00:58 +11:00
Flakebi
069853b11f
Fix #1153 Cleanup logging code
2014-10-07 20:54:54 +02:00
Deve
8818892bd2
Restore saved GPs is working again.
2014-10-07 19:16:18 +02:00
Marc Coll Carrillo
9b57d76a79
Check texture cache before adding an icon button's disabled texture
2014-10-07 18:27:08 +02:00
hiker
b2e6a4387a
Fixed linux compilation.
2014-10-07 23:15:27 +11:00
deve
3855dd646a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-07 06:54:42 +02:00
hiker
ed7a114f5f
Fix #1583 : flushing entries from the online profile cache would
...
make friend lists of other progiles incomplete. Also increased cache
size to 100.
2014-10-07 16:52:18 +11:00
deve
6b43e2dd6f
Don't allow too long GP names.
2014-10-07 06:54:02 +02:00
hiker
6a47c157d2
Removed "" around linux version number in hardware report,
...
compiler warning and windows line endings.
2014-10-07 15:42:22 +11:00
Flakebi
0193c4c7a5
Fix #1170 Add "Don't Assign" option when configuring inputs
2014-10-07 00:06:15 +02:00
Vincent Lejeune
9de7d11ee4
Fix bloom effect on mesa
2014-10-07 00:00:16 +02:00
Vincent Lejeune
20ea7ca271
GI use sun color value
2014-10-06 22:51:41 +02:00
Arthur-D
8e38f4ca30
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-06 22:39:48 +02:00
Deve
a4ac9f95c2
Use length limit for text only if it's needed.
...
This check is IMO not needed at all because translators will see if text fit in available area or not. But anyway this length should be large enough.
2014-10-06 21:57:25 +02:00
vlj
f828edb445
Fix crash with plunger
2014-10-06 20:51:04 +02:00
Deve
d270a7b80f
Merge pull request #1603 from Flakebi/fix
...
Fix #1438
2014-10-06 18:41:47 +02:00
hiker
8f7515bdbf
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-06 22:09:03 +11:00
hiker
1c7a9229f2
Added OS version for windows and distro-version for linux (not fully tested).
2014-10-06 22:08:28 +11:00
vlj
b10f1a3ef2
Tweak envmap
2014-10-06 02:29:18 +02:00
vlj
c7b98c4e6c
Emulate envmap specular reflexion
2014-10-06 02:19:21 +02:00
hiker
cb40f68229
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-06 09:07:34 +11:00
hiker
a459328676
Fix display of notifications.
2014-10-06 09:01:31 +11:00
hiker
6f5b7aa4ae
Tried a different layout for the checkboxes (sorry, but I didn't like the
...
previous approach at all). Only disadvantage now (I can think of) is that
the width of the lables is now hard coded to 40% of the screen.
2014-10-06 07:48:15 +11:00
Vincent Lejeune
44792a1490
Fix splatting
2014-10-05 22:46:02 +02:00
Vincent Lejeune
4bb73e0573
Fix godray opacity
2014-10-05 22:23:10 +02:00
Vincent Lejeune
9394f275cd
Merge branch 'specmap'
2014-10-05 21:56:10 +02:00
Vincent Lejeune
019db1a11d
Revert "Revert "Prepare shader for specmap value""
...
This reverts commit 780482edba .
2014-10-05 21:56:04 +02:00
Vincent Lejeune
0db951f374
Try to emulate enery conservation
2014-10-05 21:53:06 +02:00
Vincent Lejeune
300a09746f
Additionnal fixes
2014-10-05 21:45:56 +02:00
Vincent Lejeune
4c4aba2ad8
Some fixes
2014-10-05 21:33:11 +02:00
Flakebi
297221ca3d
Fix #1438
2014-10-05 21:32:14 +02:00
Vincent Lejeune
a8161288a9
Convert remaining shaders
2014-10-05 20:47:13 +02:00
Vincent Lejeune
9f2b66d195
Use specmap on others mats
2014-10-05 20:37:49 +02:00
Flakebi
f95eeb7f56
Fix #1602
2014-10-05 15:11:45 +02:00
hiker
2730c3c026
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-05 21:37:42 +11:00
hiker
df62c8921e
Added limited lazy-load flag to avoid loading of all font textures
...
(most of which might not be needed). Fixes #1592 .
2014-10-05 21:35:14 +11:00
Flakebi
dc78c35b50
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
data/gui/user_screen.stkgui
data/gui/user_screen_tab.stkgui
src/karts/kart.cpp
2014-10-05 12:10:39 +02:00
Vincent Lejeune
780482edba
Revert "Prepare shader for specmap value"
...
This reverts commit 88954a5d88 .
2014-10-05 02:30:15 +02:00
Vincent Lejeune
0121ae8db6
Use specmap value
2014-10-05 02:30:01 +02:00
Vincent Lejeune
88954a5d88
Prepare shader for specmap value
2014-10-05 02:12:04 +02:00
Marianne Gagnon
83b25768cc
tweak players screen, checkbox placement was weird
2014-10-04 19:44:04 -04:00
Marianne Gagnon
c1d6c054c8
Route a few more controls rendering through the skin, to make them use OpenGL 3
2014-10-04 19:38:44 -04:00
Marianne Gagnon
5a07fd0fa4
FIx crash in LOD
2014-10-04 19:05:27 -04:00
Deve
78b21eb840
Fixed visibility parameter for icon button widget.
...
It was set for widget but not for irrlicht gui element.
2014-10-04 21:51:08 +02:00
hiker
f63e7d93b8
Fixed #1598 (error message about font texture not found).
2014-10-04 23:32:54 +10:00
Marc Coll Carrillo
ee49604856
Issue #1588
...
Fixed crashes in track info screen
2014-10-04 12:15:11 +02:00
Vincent Lejeune
b56901bacd
Fix minimap halo second time it is rendered.
2014-10-04 01:42:25 +02:00
Vincent Lejeune
3a1b2442e8
Revert "Try to cull object whose aera is below 1 px"
...
This reverts commit 83053e0ee4 .
2014-10-04 00:59:37 +02:00
Marianne Gagnon
8033c5a839
Don't set animation strength on speed weighted objects, it's probably unnecessary and produces weird artifacts
2014-10-03 18:39:07 -04:00
Marc Coll Carrillo
f520e38cd5
This will (hopefully) solve the memory leaks in dynamic ribbons and image button widgets
2014-10-03 22:11:21 +02:00
Marc Coll Carrillo
cc41327db3
Merge remote-tracking branch 'upstream/master'
2014-10-03 18:15:28 +02:00
hiker
ab252a306d
Try to avoid graphical kart chassis being partially in ground (still not
...
perfect).
2014-10-04 00:39:32 +10:00
Marc Coll Carrillo
3fc0d3be09
Second try of my previous pull request, which was partially reverted due to caused crashes and memory leaks
2014-10-03 16:25:19 +02:00
Arthur-D
45c9e4fcac
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-03 11:11:30 +02:00
hiker
b5a85ae100
Fixed typo in xml output.
2014-10-03 16:48:47 +10:00
hiker
9f5b2fbc91
Added a 'print start position' option, which prints a line that can
...
be copied into a scene.xml file to start a kart at the current
position (which is useful to testing to avoid long races before
a location to be tested is reached).
2014-10-03 08:58:28 +10:00
hiker
15307f5e91
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-03 08:56:02 +10:00
Marianne Gagnon
22a884828a
Use unlit material for minimap, to avoid dark minimap segments
2014-10-02 18:52:17 -04:00
hiker
e4e91bf25a
Only cosmetical changes to follow our coding style.
2014-10-03 08:18:31 +10:00
Deve
ce51824d47
Redraw GP info screen when number of oponents was changed.
...
This allows to show or hide "Continue" button without opening screen once again.
2014-10-02 21:56:46 +02:00
Deve
69217bd03c
Grr, wrong file.
...
Fixed continue GPs
2014-10-02 20:21:46 +02:00
Deve
fccac9ed3c
Revert "Fixed continue GPs"
...
This reverts commit 710f7e7296 .
2014-10-02 20:20:50 +02:00
Deve
710f7e7296
Fixed continue GPs
2014-10-02 20:19:15 +02:00
Deve
4ecff3e46b
Use global number of oponents for grand prix
2014-10-02 20:09:59 +02:00
hiker
74841ad0c5
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-02 22:39:31 +10:00
hiker
e495b42d60
Try to fix #1356 (camera NAN crash).
2014-10-02 22:35:13 +10:00
Arthur-D
f6e9fec017
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-02 14:04:49 +02:00
samuncle
a634ff1056
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-02 13:54:55 +02:00
samuncle
97772ba1ae
set the downard impulse to 5 + a more easy to use backward camera
2014-10-02 13:53:59 +02:00
hiker
9f0b316daf
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-02 21:12:12 +10:00
hiker
38daab5357
Merge commit '2ef8598ddd1ab5593b8b3b9e0ee378cfe0f6bc2c'
2014-10-02 21:08:44 +10:00
hiker
ecd5aa1668
Bugfix: tall karts would easily topple over (since wrong height
...
value was used).
2014-10-02 17:08:26 +10:00
vlj
b4133d8d54
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-02 02:53:35 +02:00
vlj
30dda3e343
Fix sky warp
2014-10-02 02:53:31 +02:00
Marianne Gagnon
bdb722df45
Fix splatting
2014-10-01 20:26:39 -04:00
Marianne Gagnon
11bf9d15c7
Disable source of OpenGL warnings flood in code we don't use
2014-10-01 20:23:22 -04:00
hiker
de9a1f51a7
Removed empty 'online overview' page, show the achievements page instead.
2014-10-02 07:59:24 +10:00
Arthur-D
2076db459d
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-01 16:03:55 +02:00
hiker
a643905053
Minor fix for the (currently unused) downward impulse: only apply it
...
when all four wheels are touching the ground (otherwise the jump
distance is significantly shortened); also fix handling of negative
speed (plus some changes to commented out debug output).
2014-10-01 23:41:13 +10:00
Shantanu Singh
2ef8598ddd
corrected a typo which was earlier written as tpye instead of type
2014-10-01 18:42:51 +05:30
Arthur-D
c6d789d1ff
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-01 11:52:53 +02:00
deve
7b308e9976
Partially revert marcoll pull requeust since it causes crashes and memory leaks.
2014-10-01 07:08:19 +02:00
hiker
49176dd348
Removed debug output, added documentation.
2014-10-01 12:28:10 +10:00
hiker
86b23f2d23
Merge remote-tracking branch 'origin/master' into soft-physics-landing
2014-10-01 11:58:40 +10:00
vlj
783494b4a8
Fix particles being killed too soon
2014-10-01 03:03:07 +02:00
hiker
b6b29f6281
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-01 09:32:13 +10:00
Marianne Gagnon
7387a51381
Disable features of irrlicht's contextual menu that we don't need and cause floods of warnings
2014-09-30 19:33:25 -04:00
hiker
f4f914e289
Don't send a second, empty GL_EXTENSION string to our stats server.
2014-10-01 09:31:42 +10:00
vlj
2236e8dd1c
Fix extra respawning particles
2014-10-01 01:19:49 +02:00
Arthur-D
7bbcae3056
Merge branch 'soft-physics-landing' of https://github.com/supertuxkart/stk-code
2014-10-01 00:31:02 +02:00
Arthur-D
3e547705bc
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-10-01 00:30:47 +02:00
Vincent Lejeune
83053e0ee4
Try to cull object whose aera is below 1 px
2014-09-30 22:00:55 +02:00
Vincent Lejeune
838e1b63da
Split cascade gpu timer
2014-09-30 21:39:56 +02:00
Vincent Lejeune
cbd6d22b41
Fix AZDO with normal/detail
2014-09-30 21:30:37 +02:00
Flakebi
47da30dd24
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-30 19:22:18 +02:00
hiker
e55959555e
Added more debug output.
2014-09-30 23:59:17 +10:00
hiker
11916dd187
Different implementation of soft-landing.
2014-09-30 23:13:48 +10:00
hiker
26e92846de
Merge remote-tracking branch 'origin/master' into soft-physics-landing
2014-09-30 15:15:56 +10:00
hiker
2f27d49198
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-30 15:02:40 +10:00
hiker
8ca7730570
Removed unnecessary source file in glew.
2014-09-30 15:01:38 +10:00
Marianne Gagnon
7db152ce58
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-29 20:55:13 -04:00
Marianne Gagnon
f2ffcb680d
Work around missing cake explosions at low framerates, the burst time would be shorter than one frame and the emitter was shut down before it could even begin to emit
2014-09-29 20:54:47 -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
768d843cfe
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-30 09:49:25 +10:00
hiker
2cab457cbc
Removed unnecessary call to getAsset().
2014-09-30 09:47:57 +10:00
Marianne Gagnon
c3d8df65e1
Merge branch 'marcoll_master'
2014-09-29 19:21:56 -04:00
Marianne Gagnon
a9936434f0
VS compilation fix
2014-09-29 19:21:45 -04:00
Marianne Gagnon
24480ea0c1
First attempt at caching tangents meshes
2014-09-29 19:12:37 -04:00
Marianne Gagnon
c26a2413b2
Properly cleanup mesh cache, fixes crash on second play
2014-09-29 18:42:10 -04:00
Deve
d0e30c15a5
Reset counter when game is restarted
2014-09-29 21:56:32 +02:00
Deve
1c97476369
Display wrong way message after a delay.
2014-09-29 20:21:05 +02:00
Deve
b3c6cbf5d8
Fixed linux compilation
2014-09-29 18:19:22 +02:00
hiker
7c429b2a2d
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-29 22:45:21 +10:00
deve
9a520c4dd6
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-29 14:44:28 +02:00
hiker
6cdce11fb7
Fix #1576 (crash when viewing other online user's friends).
2014-09-29 22:42:51 +10:00
deve
0943f0ed76
Add debug flags for mingw
2014-09-29 13:35:17 +02:00
samuncle
af037d6267
tweak particle.xml
2014-09-29 12:30:43 +02:00
hiker
8a52949e74
Merge remote-tracking branch 'origin/master' into soft-physics-landing
2014-09-29 19:29:20 +10:00
deve
226eeb2718
Add inet_ntop function for mingw compiler
2014-09-29 09:19:38 +02:00
hiker
388937a487
Fixed info message.
2014-09-29 12:09:19 +10:00
hiker
79873e2d45
Added (some) support for driving on walls, added documentation.
2014-09-29 11:54:46 +10:00
vlj
b89f066d14
Merge branch 'minlicht'
2014-09-29 03:25:04 +02:00
vlj
a88bb8eb6c
Improve debug msg
2014-09-29 03:01:36 +02:00
vlj
69896fdc6a
Fix material detection
2014-09-29 03:01:36 +02:00
vlj
273a2bf022
Set normal map and detail map in material.cpp
2014-09-29 03:01:35 +02:00
vlj
7b165574c0
Merge MAT_* with shadertype
2014-09-29 03:01:34 +02:00
vlj
ecb2f74711
Add default texture to m_sun_interposer
2014-09-29 02:56:32 +02:00
vlj
4705b8d1a1
Remove X/MS3D file loader
2014-09-29 02:52:06 +02:00
vlj
9a5ecc1b23
Remove ogre loader
2014-09-29 02:46:15 +02:00
vlj
3c4a22d659
Remove Half Life loader
2014-09-29 02:38:23 +02:00
vlj
b19a9bdf2f
Remove 3DS Loader
2014-09-29 02:25:31 +02:00
vlj
554cb1dda0
Remove another CBurning file
2014-09-29 02:01:49 +02:00
vlj
398a556df2
Use glVertexAttribDivisorARB
...
If GL 3.1 is supported but not 3.3, use glVertexAttribDivisorARB instead
of glVertexAttribDivisor
2014-09-29 01:50:33 +02:00
vlj
e2da98bcfb
Use glsl with GL >= 3.1
2014-09-29 01:44:24 +02:00
vlj
abeda85f77
Reenable GL 3.1 support on windows
2014-09-29 01:31:59 +02:00
hiker
a86b4e489c
First version of 'smooth landing' in physics.
2014-09-28 23:18:52 +10:00
Marc Coll Carrillo
2651c082a4
Issue #1505
...
Dynamically change font size in a DynamicRibbonWidget to make labels fit,
and also cut the text when it's just too long
2014-09-28 10:18:47 +02:00
Marc Coll Carrillo
eaf6ee9556
Merge remote-tracking branch 'upstream/master'
2014-09-28 09:27:09 +02: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
vlj
6061a77884
Use the newly introduced material
2014-09-28 02:03:23 +02: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
8d99fa2cb1
Return default material when no special material for current texture
2014-09-27 19:24:39 -04:00
vlj
a303eadf3d
Remove a deprecated function call
2014-09-28 01:13:38 +02:00
Marianne Gagnon
7b5ce0f9d7
Fix compilation, why this didn't work for me but works for others is a mystery
2014-09-27 19:07:29 -04:00
Marianne Gagnon
f5de76a988
Merge branch 'master' of https://github.com/supertuxkart/stk-code
...
Conflicts:
src/graphics/stkmesh.hpp
2014-09-27 18:51:49 -04:00
Marianne Gagnon
906b7e8c51
Pass STK Material objet to MapMaterial functions
2014-09-27 18:51:10 -04:00
vlj
a9ab147ae5
Remove software renderer
2014-09-28 00:48:20 +02:00
vlj
b5372c295d
Remove D3D related files
2014-09-27 19:46:49 +02:00
vlj
9e2061e88b
Clean some code
2014-09-27 19:28:09 +02:00
vlj
f7bc014b16
Merge remote-tracking branch 'origin/glplaincore'
2014-09-27 19:12:26 +02:00
vlj
9cc98f57e3
Reapply patch from http://sourceforge.net/p/glew/patches/40/
...
This reverts commit dd70f09fce .
2014-09-27 18:49:33 +02:00
Deve
f2ac1dca55
Merge pull request #1577 from konstin/asan_fix
...
fix asan new-delete-missmatch
2014-09-27 17:18:18 +02:00
konstin
cfd18366db
fix asan new-delete-missmatch
2014-09-27 17:12:58 +02:00
hiker
dfc3756f5d
Fixed compiler warning.
2014-09-27 19:25:45 +10:00
vlj
669c8af73e
Try to fix linux, round 2
2014-09-26 23:36:13 +02:00
vlj
ac2a40837f
Try to fix linux
2014-09-26 23:28:29 +02:00
vlj
18b0c65dd6
Use core context for linux too.
2014-09-26 23:21:09 +02:00
vlj
1e5ad1060b
Use core context except for legacy
2014-09-26 23:17:05 +02:00
vlj
8e67131351
Another fix
2014-09-26 23:15:56 +02:00
vlj
b79e969b11
Remove some others deprecated calls
2014-09-26 23:10:10 +02:00
vlj
3b393b8618
Set useCoreContext outside of ifdef windows
2014-09-26 23:03:44 +02:00
vlj
f41c1497cf
Revert "Declare bool in CIrrDeviceLinux"
...
This reverts commit 35de5d3975 .
2014-09-26 23:03:25 +02:00
vlj
35de5d3975
Declare bool in CIrrDeviceLinux
2014-09-26 23:01:45 +02:00
vlj
ced7eb4d36
Another couple of glDisable(GL_ALPHA_TEST)
2014-09-26 22:50:40 +02:00
vlj
f75e21a226
Remove glDisable(GL_ALPHA_TEST)
2014-09-26 22:46:01 +02:00
vlj
64a84f7e58
Fix another bunch of deprecated function calls
2014-09-26 22:39:53 +02:00
hiker
544f15d693
Removed outdated comment.
2014-09-26 23:48:10 +10:00
vlj
032447bf30
Additionnal work.
2014-09-26 15:42:03 +02:00
vlj
f320b36db3
Do not use some deprecated function with core ctx
2014-09-26 15:27:50 +02:00
hiker
a593c81a64
Some improvement for #1505 , but still wip.
2014-09-26 16:33:47 +10:00
hiker
2d7b8228e9
Fix #1565 : Added better instructions for account creation screen (and also made the
...
instructions actually visible).
2014-09-26 08:57:52 +10:00
Deve
babe9b0023
Fixed issue with sound which was starting in a loop
2014-09-25 19:57:35 +02:00
Flakebi
a02e8d4583
Apply merge properly...
2014-09-25 17:06:20 +02:00
Marc Coll Carrillo
0fd5d0357f
Icon buttons now appear in grayscale when they are deactivated
2014-09-25 12:04:43 +02:00
deve
57c14f2c07
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-25 11:56:28 +02:00
deve
4fd3d977e4
Restore help printing when logs are printed only to stdout.log file.
2014-09-25 10:25:44 +02:00
hiker
cccf86e6a6
Bugfix: packet_log file would be overwritten at the end of a run.
2014-09-25 17:19:55 +10:00
hiker
679a6a7676
Fix #1567 (don't write packets_log.txt in cwd).
2014-09-25 17:15:05 +10:00
hiker
48d99086f1
Fix $1569 (allow adjusting of polling interval from server via news.xml
...
or polling response data).
2014-09-25 17:04:36 +10:00
Marianne Gagnon
df8c2cb2c3
Make missing texture non-fatal, hopefully that won't cause issues
2014-09-24 21:07:03 -04:00
hiker
3a14b38947
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-25 09:07:41 +10:00
hiker
7c66dd1865
Fix #1516 . Also fixed (probably unrelated) bug that first time STK
...
is started with internet permission, the addon server would not be
accessible. Note: any current configuration will not be read anymore
(if you need it, you can just move the files and directories from
.../supertuxkart into .../supertuxkart/0.8.2 (except addons, whic
stays in .../supertuxkart/addons!!).
2014-09-25 09:05:46 +10:00
Vincent Lejeune
3be8fdf82c
Declare extension usage for vertex shader layer
2014-09-24 23:43:43 +02:00
Deve
856ee103cf
Merge remote-tracking branch 'origin/master'
2014-09-24 18:12:20 +02:00
Deve
c6cb84a1be
Find best fit resolution only in fullscreen mode.
2014-09-24 18:04:14 +02:00
Flakebi
2cf9707294
Merge branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
src/states_screens/kart_selection.cpp
I hope I got everything
2014-09-24 17:58:12 +02:00
hiker
203d987127
Fix compiler warnings.
2014-09-24 23:31:41 +10:00
Deve
b524f72bb5
Revert "Small correction in dynamic ribbon to avoid some weird behaviour in the GP editor"
...
This reverts commit 6b42f1b7b7 .
2014-09-24 06:39:46 +02:00
hiker
8db34bed3c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-24 10:58:55 +10:00
hiker
044972be2a
Activate HW reporting.
2014-09-24 10:58:34 +10:00
Marianne Gagnon
6695238284
Fix loading normal maps (new XML syntax)
2014-09-23 20:11:03 -04:00
Marianne Gagnon
8a0fb9c187
Disable old hack that causes more trouble than it's worth
2014-09-23 19:57:09 -04:00
vlj
562fe802f6
Fix stk text billboard orientation
2014-09-24 01:37:31 +02:00
vlj
58e1b73752
Fix bloom computation
2014-09-24 01:19:37 +02:00
hiker
538694c1d1
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-24 08:52:31 +10:00
hiker
9e34a2912c
Fix linux compilation.
2014-09-24 08:52:06 +10:00
Marianne Gagnon
544d3afa23
Fix another bug found while reviewing previous pull request
2014-09-23 18:46:48 -04:00
vlj
de4c1c880b
Use lesser rtt size for diffuse/specular
2014-09-24 00:46:48 +02:00
auriamg
a8f6b78524
Merge pull request #1561 from marcoll/master
...
Some minor corrections
2014-09-23 18:46:30 -04:00
Marianne Gagnon
6df86551eb
Remove unused code
2014-09-23 18:40:07 -04:00
vlj
dc6f989b13
Do not use matrix inversion for culling
2014-09-24 00:24:53 +02:00
hiker
12c1183c86
Fixed #1560 .
2014-09-24 08:12:08 +10:00
hiker
3054ffe146
Fix #1554 (don't display server related screens on GUI for 0.8.2).
2014-09-24 07:58:28 +10:00
Marc Coll Carrillo
9c56d66c2d
Minor corrections (a couple of warnings, unused headers...)
2014-09-23 22:23:24 +02:00
Marc Coll Carrillo
6b42f1b7b7
Small correction in dynamic ribbon to avoid some weird behaviour in the GP editor
2014-09-23 22:19:25 +02:00
vlj
342184204b
Simplify #includes
2014-09-23 19:31:12 +02:00
vlj
fffd61fffb
Simplify #includes
2014-09-23 19:25:04 +02:00
vlj
bf62d28070
Simplify #includes
2014-09-23 19:21:51 +02:00
vlj
a246887a29
Simplify #include s
2014-09-23 19:17:33 +02:00
vlj
abffec69af
Simplify #include s
2014-09-23 19:12:00 +02:00
deve
1fad8fd994
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-23 15:48:59 +02:00
deve
227b6aee22
Avoid to update ribbon widget too many times.
...
It fixes displaying screenshots in GP editor after switching between category tabs.
2014-09-23 15:41:31 +02:00
hiker
06523a62c3
Fixed typo, renamed file to have proper extension.
2014-09-23 22:58:08 +10:00
hiker
3d4f054df8
Fix pre cmake 3.0 usage.
2014-09-23 21:01:04 +10:00
hiker
7c3d49e631
Accidentally committed file.
2014-09-23 20:51:20 +10:00
hiker
85ebcf1434
Fix VS 2013 compilation.
2014-09-23 20:50:50 +10:00
hiker
53f05e868d
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-23 20:18:09 +10:00
Deve
cfa4d455b0
Merge pull request #1547 from marcoll/master
...
Fix issues with the new "reverse grand prix" feature and user defined GPs
2014-09-23 10:59:43 +02:00
deve
8eb51f78b4
Fixed warning in cmake 3.0 and above.
...
If I understand correctly, the COMPILE_DEFINITIONS_DEBUG property is ignored in newer versions of cmake. I fixed it by forcing to use old method.
2014-09-23 09:11:39 +02:00
hiker
4f95aee051
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-23 16:45:08 +10:00
hiker
aa64f31f83
Added Screen::push() function to shorten the calls to pushScreen().
2014-09-23 16:43:50 +10:00
deve
667245f5aa
Avoid redeclaration for mingw compiler
2014-09-23 08:38:30 +02:00
deve
d007703d6b
Fixed warning when SOCKET_ERROR is already defined.
2014-09-23 08:28:39 +02:00
hiker
596cc44dfa
Fixed line endings.
2014-09-23 16:26:41 +10:00
hiker
c28728d903
Removed more compiler warnings for 64 bit windows compilation.
2014-09-23 16:23:22 +10:00
hiker
13cbde2e09
Added new supertuxkart.appdata file from hughsie ( #1545 ).
2014-09-23 15:51:06 +10:00
hiker
2c80feb3b5
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-23 15:12:48 +10:00
hiker
5ec883b86a
Minor code simplification.
2014-09-23 15:12:26 +10:00
hiker
ad20635cce
Applied patch for #600 (support 64 bit compilation on windows).
2014-09-23 14:41:32 +10:00
hiker
9ce20435d2
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-23 09:04:14 +10:00
hiker
ea324a8252
Disable 800x600 resolution in release mode (it's useful for debugging,
...
so I'll keep it in debug mode).
2014-09-23 09:03:03 +10:00
hiker
29c162bdf8
Fixed compiler warnings.
2014-09-23 08:56:07 +10:00
hiker
4ff8f6dfe5
Fix release compilation.
2014-09-23 08:17:04 +10:00
Vincent Lejeune
7ac0c14869
Fix travis
2014-09-22 23:50:53 +02:00
hiker
e4f38fa244
Disable console thread from networking code - not needed atm, and
...
making this thread safe is not trivial.
2014-09-23 07:48:21 +10:00
Vincent Lejeune
cd4916297d
Use a simpler frag shader for grass shadow
2014-09-22 23:40:38 +02:00
Vincent Lejeune
8989241846
Fix debug output error for sync object
2014-09-22 23:40:21 +02:00
Vincent Lejeune
7d0e34a8c9
Remove unecessary forced lod for shadow
2014-09-22 19:09:18 +02:00
Vincent Lejeune
8b8895c79a
Remove some unused variable
2014-09-22 18:14:04 +02:00
hiker
44af65fddd
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-22 23:59:58 +10:00
hiker
a550f6bf6b
Try to make crash in #1529 unlikely - though it needs a proper fix still.
2014-09-22 23:57:37 +10:00
vlj
b376dcd6fe
Revert "Reduce size of some rtt"
...
This reverts commit e08bf299be .
2014-09-22 15:30:45 +02:00
vlj
160ed179c3
Revert "Actually RH requires higher depth for alpha"
...
This reverts commit 9552a73ea8 .
2014-09-22 15:30:37 +02:00
hiker
99fd49bdc0
Run SFX in a separate thread (for #1511 ).
2014-09-22 17:04:14 +10:00
hiker
2b86705dc0
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-22 16:17:26 +10:00
hiker
4cea6bd7fe
Fixed #709 (Missing R with caron in title font). Thanks!
2014-09-22 15:53:40 +10:00
hiker
302470df7e
Fixed #1266 (we won't need a --players command line option anyway).
2014-09-22 12:09:49 +10:00
hiker
9b0a6d2703
Allow the hw-report-server to be changed using the news.xml file.
2014-09-22 08:26:49 +10:00
hiker
b4e16e8852
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-22 07:55:06 +10:00
hiker
249c34cd0d
Fixed achievement warning.
2014-09-22 07:54:34 +10:00
Vincent Lejeune
9552a73ea8
Actually RH requires higher depth for alpha
2014-09-21 19:46:36 +02:00
Vincent Lejeune
4672492269
Clean transparentmesh for non animated meshes
2014-09-21 19:35:49 +02:00
vlj
bc9345a227
Merge pull request #1553 from konstin/master
...
fix cleaning of transparent meshes and close #1522
2014-09-21 19:35:12 +02:00
konstin
a9bc44f7eb
fix cleaning of transparent meshes and close #1522
2014-09-21 19:30:07 +02:00
Vincent Lejeune
0dc3854df1
Reorganise animated mesh cleaning
2014-09-21 19:12:24 +02:00
Vincent Lejeune
e08bf299be
Reduce size of some rtt
2014-09-21 19:06:05 +02:00
Vincent Lejeune
034058f63a
Fix plunger crash
2014-09-21 18:28:13 +02:00
Vincent Lejeune
4df40c3de5
Fix multiplayer in basic glsl mode
2014-09-21 18:11:44 +02:00
vlj
0b178b9c1a
Remove gloss on splatting
2014-09-21 04:20:27 +02:00
Marianne Gagnon
a33e9a88fd
fix spaltting
2014-09-20 22:12:17 -04:00
vlj
97ea994c6a
Revert "Improve swizzle of splatting"
...
This reverts commit 98ca75c34d .
2014-09-21 04:10:51 +02:00
vlj
98ca75c34d
Improve swizzle of splatting
2014-09-21 03:59:03 +02:00
Marianne Gagnon
5c0c158244
Make some progress on fixing splatting
2014-09-20 21:28:51 -04:00
Marianne Gagnon
90042bc9e4
Properly fix gloss maps
2014-09-20 21:23:22 -04:00
Marianne Gagnon
58e20bebd7
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-20 20:48:12 -04:00
Marianne Gagnon
e0e55c56c2
Fix specular
2014-09-20 20:45:58 -04:00
hiker
f31a85268e
Added error message in case a not-yet-supported platform tries to report
...
memory or #procs.
2014-09-21 10:44:33 +10:00
hiker
b3c2909053
Fix compiler warning.
2014-09-21 10:44:15 +10:00
Vincent Lejeune
7af5e5c50c
Fix text billboard crash
2014-09-20 21:17:44 +02:00
Vincent Lejeune
f30ea823e5
Factorise non instanced 2nd pass too.
2014-09-20 19:43:15 +02:00
Vincent Lejeune
5643e38886
Some factorisation for non instanced path
2014-09-20 19:28:06 +02:00
Vincent Lejeune
b3e124b93e
Some fixes
2014-09-20 18:48:22 +02:00
Vincent Lejeune
7406ceb876
Additionnal factorisation
2014-09-20 18:09:48 +02:00
Vincent Lejeune
54347458fd
Factorise material rendering code
2014-09-20 17:44:28 +02:00
vlj
88ebb46614
More cleanup
2014-09-20 16:44:09 +02:00
vlj
562d496df3
Clean some code.
2014-09-20 16:40:18 +02:00
hiker
b4208fe52d
Try to report number of processors for apples (untested).
2014-09-20 23:39:33 +10:00
hiker
b14abb8b53
Fix linux build.
2014-09-20 14:35:32 +10:00
hiker
f25794327b
Report #cores for linux (untested) and windows.
2014-09-20 14:09:37 +10:00
Vincent Lejeune
8c4bbf7527
Log texture name
2014-09-20 02:20:25 +02:00
Marianne Gagnon
46b490c0de
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-19 20:18:09 -04:00
Marianne Gagnon
53f9c5efdc
Fix tangent generation in track objects
2014-09-19 20:17:49 -04:00
Vincent Lejeune
df18331cfc
Complete fix for detail
2014-09-20 02:16:28 +02:00
Vincent Lejeune
f6d2ff92f1
Merge remote-tracking branch 'origin/glossmap'
2014-09-20 01:57:55 +02:00
Vincent Lejeune
1983fb8fc2
Really fix detailmap
2014-09-20 01:53:15 +02:00
Vincent Lejeune
4e6d29e1ef
Fix detail map
2014-09-20 01:38:13 +02:00
Vincent Lejeune
ad6728ce51
Apparently fix minimap
2014-09-20 01:31:11 +02:00
Vincent Lejeune
317d7c870d
Try to fix detail map default tex
2014-09-20 01:18:40 +02:00
Marc Coll Carrillo
bbbe0ddf8d
Fix issues with the new "reverse grand prix" feature and user defined GPs
2014-09-19 23:25:03 +02:00
Vincent Lejeune
f526d194dc
Remove useless field in single texture instance
2014-09-19 23:12:13 +02:00
Vincent Lejeune
cab71ff9fe
Fix crash in kart selection screen.
2014-09-19 23:09:23 +02:00
Vincent Lejeune
8bce7fe142
Add a guard if a texture is missing.
2014-09-19 23:09:23 +02:00
Vincent Lejeune
b034049a28
Support for 3 tex mats
2014-09-19 23:09:22 +02:00
Deve
12977c3764
Merge pull request #1530 from marcoll/master
...
Some improvements to the GP editor
Merged because it fixes some issues. Previously I wasn't able to create new GP without a crash.
2014-09-19 21:54:38 +02:00
Deve
a21b300e8a
Fixed speed value at the kart selection start
2014-09-19 21:40:31 +02:00
Vincent Lejeune
5e64be41c6
Remove useless field in single texture instance
2014-09-19 19:58:28 +02:00
Marianne Gagnon
000b427f58
Fix ref counting crash
2014-09-19 19:54:16 +02:00
Vincent Lejeune
4b2b56035f
Use default mat for untextured mat too
2014-09-19 19:54:16 +02:00
Marianne Gagnon
478110f4bf
Remove outdated comment
2014-09-19 19:54:15 +02:00
Marianne Gagnon
933e27052d
Create a "default material" object and use it for materials that don't appear in materials.xml, instead of an hardcoded special case
2014-09-19 19:54:15 +02:00
Vincent Lejeune
3349b9907d
Improve naming convention of textures
2014-09-19 19:54:14 +02:00
Vincent Lejeune
39c56dcb78
Slightly improve getUnicolorTexture
2014-09-19 19:54:14 +02:00
Vincent Lejeune
24cd727899
Add glossytex to textures
2014-09-19 19:54:00 +02:00
vlj
9a114b2f6f
Gather glsl material handling code
2014-09-19 19:22:04 +02:00
Vincent Lejeune
bb63cf9e86
Clean material handling code.
2014-09-19 19:22:03 +02:00
Vincent Lejeune
1f05a66b79
Split material into single/dual tex
2014-09-19 19:12:46 +02:00
Vincent Lejeune
f86663f9c2
Add Instance type to some templates
2014-09-19 18:49:14 +02:00
vlj
8dff9b5b98
Factorize part of scenemanager
2014-09-19 18:43:18 +02:00
vlj
1bd487fb60
Factorize Instance Vertex Attrib Setter
2014-09-19 18:43:17 +02:00
hiker
8a25683e2c
Disable submitting the data for now.
2014-09-19 16:28:30 +10:00
hiker
63c7d02c7e
Made line endings consistent.
2014-09-19 16:25:18 +10:00
hiker
c05896729e
Made the user_id (which is apparently necessary on the server to calculate
...
number of configurations correctly) a random number, that is saved in the
config file.
2014-09-19 16:23:26 +10:00
hiker
2600b17132
Removed unused code and objects.
2014-09-19 14:31:25 +10:00
hiker
e18c20db65
Fixed various compiler warnings.
2014-09-19 11:02:20 +10:00
hiker
64702d8ada
Don't submit requests for now (server is still expecting compressed
...
data, and can't handle he requests we send atm).
2014-09-19 09:41:44 +10:00
hiker
48e5e7c4e6
Added a version number to the hardware report, and report the hw config
...
only once per installation. Print error messages in case submitting the
request.
2014-09-19 09:40:11 +10:00
hiker
cba1c8c471
Report memory on windows and osx (not tested).
2014-09-19 08:16:20 +10:00
hiker
00f7829ad4
Fixed (c) statement.
2014-09-19 08:15:59 +10:00
hiker
48938f2880
Started to add GL limits to the statistics. Work in progress.
2014-09-18 22:09:56 +10:00
hiker
08b2beb339
Report available RAM on linux.
2014-09-18 15:55:25 +10:00
hiker
2e42898f4a
Fixed incorrect value for opengl version.
2014-09-18 12:55:30 +10:00
hiker
e7096bc3b0
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-18 11:43:59 +10:00
hiker
c147dacbc2
Queue up sfx instead of starting them immediately. Preparation for
...
threading the sfx manager.
2014-09-18 11:43:26 +10:00
konstin
47deab4614
commenting out an unused function which only throws deprecation warnings
2014-09-18 02:19:26 +02:00
hiker
64fc2dd968
Added comments.
2014-09-18 07:55:24 +10:00
hiker
8c3beef69b
Removed unnecessary static variable.
2014-09-18 07:48:31 +10:00
Vincent Lejeune
9ba19c7290
Move m_sync
2014-09-17 18:49:15 +02:00
hiker
66da6d9435
Removed old/unused declaration.
2014-09-17 22:08:43 +10:00
hiker
86b351fbf4
Turn sfx_manager into a singleton.
2014-09-17 21:38:21 +10:00
Flakebi
9bcc76127f
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-17 13:20:09 +02:00
hiker
04dd7869cb
Added gfx_drv_ver and gfx_vard to hardware report.
2014-09-17 16:58:50 +10:00
hiker
fca103b6a0
File missing in previous commit.
2014-09-17 16:16:38 +10:00
hiker
9035fde10b
Avoid crashes on server side by supplying (unnecessary) values like
...
os_win=0 on linux etc. Added more opengl data to keep the server
happier ... though not yet entirely happy ;)
2014-09-17 16:08:41 +10:00
hiker
8efc7110c8
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-17 13:41:54 +10:00
hiker
c7650ba769
Fixed parameter names and missing / in URL (which is required).
2014-09-17 13:21:03 +10:00
Marianne Gagnon
105f7b49a3
Add profier marker for updatePhysics
2014-09-16 20:19:07 -04:00
Vincent Lejeune
1d2c77d86a
Use ProjectionViewMatrix in glow_object.vert
2014-09-17 02:12:28 +02:00
Vincent Lejeune
13402543ce
Use glClientWaitSync with a 0 timeout
...
It turns out to be much more responsive this way.
2014-09-17 01:01:45 +02:00
hiker
008aa7f22f
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-17 08:47:24 +10:00
hiker
1e1f921d08
Fix turning behaviour (karts would turn a lot more than with
...
previous stk versions, which resulted in hard controlling karts
(esp. at higher speed).
2014-09-17 08:44:28 +10:00
Vincent Lejeune
a2a6553d93
Fix srgb mismatch
2014-09-17 00:11:34 +02:00
vlj
534bcedecb
Fix for multiplayer with non basic mode.
2014-09-16 23:22:02 +02:00
Vincent Lejeune
19420fb5f2
Some fix for basic glsl mode
2014-09-16 19:46:21 +02:00
Vincent Lejeune
e2b6538d2d
Avoid clearing buffer if not strictly necessary
2014-09-16 19:42:10 +02:00
Vincent Lejeune
b9c547278f
Do not enter renderLights if dynamic light is disabled
2014-09-16 19:24:47 +02:00
Vincent Lejeune
d6d4b1948c
Use glewExperimental on OSX too
2014-09-16 17:19:24 +02:00
Vincent Lejeune
dd70f09fce
Revert "Apply patch from http://sourceforge.net/p/glew/patches/40/ "
...
This reverts commit ef5039c02f .
2014-09-16 17:17:56 +02:00
Vincent Lejeune
20f10e0235
Revert "Remove glewexperimental flag"
...
This reverts commit 7516dc920a .
2014-09-16 17:17:51 +02:00
Vincent Lejeune
7516dc920a
Remove glewexperimental flag
2014-09-16 16:06:58 +02:00
Vincent Lejeune
ef5039c02f
Apply patch from http://sourceforge.net/p/glew/patches/40/
2014-09-16 16:05:24 +02:00
Vincent Lejeune
1f383245d6
Merge branch 'master-fix'
2014-09-16 15:34:39 +02:00
Vincent Lejeune
58fc801322
Slightly extend coverage of ssao cs
2014-09-16 15:18:29 +02:00
Vincent Lejeune
b769e46a00
Use texture instead of image in SSAO.
2014-09-16 15:18:29 +02:00
hiker
e4fd6ed32b
Merge remote-tracking branch 'origin/master'
2014-09-16 22:27:55 +10:00
hiker
9cdbaebd29
Started to add hardware stats reporting functionality.
2014-09-16 22:27:41 +10:00
hiker
e8aa181348
Merge remote-tracking branch 'origin/master' into include-glew
2014-09-16 11:05:35 +10:00
Vincent Lejeune
546cbabf3e
Use ifdef WIN32 for test purpose
2014-09-16 01:14:45 +02:00
Vincent Lejeune
4c6df4821d
Revert "Do not allow specvalue to be below 0."
...
This reverts commit 6b4430caaa .
2014-09-16 00:37:49 +02:00
Vincent Lejeune
fbb71bca7e
Revert "Fix negative value inside tonemap"
...
This reverts commit 16dc973faa .
2014-09-16 00:37:37 +02:00
Vincent Lejeune
b5598fda57
Revert "Force non negative value in bloom"
...
This reverts commit cb922ed4db .
2014-09-16 00:37:23 +02:00
Vincent Lejeune
45b15c1d65
Add some memory barrier when using compute shaders
2014-09-16 00:34:23 +02:00
Vincent Lejeune
bd4602fb5d
Fix context creation on linux when driver support gl 4.3
2014-09-15 23:39:48 +02:00
vlj
cb922ed4db
Force non negative value in bloom
2014-09-15 22:11:53 +02:00
hiker
8029bc5880
Build a static version of glew.
2014-09-15 21:49:06 +10:00
hiker
69473b1811
Try to include glew in stk.
2014-09-15 16:33:46 +10:00
hiker
8dfe72f73f
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-15 12:41:34 +10:00
Marianne Gagnon
835b329c46
kart selection screen : don't reload RTT scene if the selected kart hasn't changed
2014-09-14 19:16:06 -04:00
Vincent Lejeune
16dc973faa
Fix negative value inside tonemap
...
It should be checked before but since it's not always reproducible.
2014-09-15 01:10:12 +02:00
Marianne Gagnon
05d43440b2
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-14 19:07:00 -04:00
Marianne Gagnon
3536e13c49
Tweak fade-in/fade-out times in cutscenes and remove hardcoded values
2014-09-14 19:06:19 -04:00
Vincent Lejeune
6b4430caaa
Do not allow specvalue to be below 0.
...
Just in case it shouldnt be possible anyway.
2014-09-15 01:06:15 +02:00
Vincent Lejeune
0d982e55f0
Do not use kart position if there is no kart
2014-09-15 00:42:48 +02:00
Vincent Lejeune
866cd2b979
Set texture matrix in updateNoGL and not in updateGL
2014-09-15 00:16:50 +02:00
hiker
e26e10db61
Fixed compilation of font_tool.
2014-09-15 07:45:13 +10:00
Vincent Lejeune
476f95a6c9
Fix snb on linux
2014-09-14 23:41:42 +02:00
Vincent Lejeune
7c54ac4d81
Fix second texcoord in instanced_object_pass.vert
2014-09-14 23:07:10 +02:00
Vincent Lejeune
cd68be24f5
Delete sync object
2014-09-14 17:35:16 +02:00
Deve
0eb09af027
Filtering actions is not needed now
2014-09-14 17:08:40 +02:00
Deve
8ea38fe622
Block event for one-element ribbon widget in the same way as multi-element widget.
...
This fixes problem with pressing left and right arrow in track and GP info screen.
2014-09-14 17:06:21 +02:00
vlj
26b69ecace
Use __linux__ macro
2014-09-13 23:35:15 +02:00
vlj
108215dfdd
Add a dtor to animated mesh
2014-09-13 15:57:39 +02:00
vlj
6d685a843d
Drop support for GL 3.1 on windows
...
Fixed pipeline will be used instead
2014-09-13 15:45:10 +02:00
Marc Coll Carrillo
5cf3ad220f
Some improvements to the GP editor:
...
- GP are now classified into groups, just like tracks: standard, user defined, and add-ons
- allow empty GPs to be loaded by the GP manager, so that they can appear
on the GP editor (but not on the track selection screen)
- enable/disable buttons depending on the available options
- provide some feedback after pushing the "save" button
- some minor bug corrections and improvements
2014-09-13 10:40:27 +02:00
Sachith Hasaranga Seneviratne
10e2634f22
Merged master
2014-09-13 08:45:41 +05:30
Vincent Lejeune
1d913ad5b4
Do not set glewExperimental outside of linux
2014-09-13 02:02:05 +02:00
Vincent Lejeune
349a64ae8d
Revert "Use a parallel loop for IA"
...
This reverts commit 8e333afa99 .
2014-09-13 01:32:40 +02:00
Vincent Lejeune
674f0a5f05
Reenable billboards
2014-09-13 01:21:09 +02:00
Vincent Lejeune
d480c52f8c
Revert "Try to put IA in its own thread"
...
This reverts commit 2a60a84155 .
2014-09-12 23:22:54 +02:00
Vincent Lejeune
2a60a84155
Try to put IA in its own thread
2014-09-12 23:04:40 +02:00
Flakebi
cc60fe817b
One more fix for singleplayer
2014-09-12 23:04:06 +02:00
Vincent Lejeune
78e512880c
Remove unneeded functions
2014-09-12 19:29:01 +02:00
Vincent Lejeune
8e333afa99
Use a parallel loop for IA
...
It sighltly helps decreasing stuttering in some area of chocolate.
2014-09-12 19:10:22 +02:00
hiker
c4b6307ec9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-13 01:24:17 +10:00
Vincent Lejeune
9453541006
Merge remote-tracking branch 'origin/master-fix'
2014-09-12 17:22:59 +02:00
hiker
991f60d06d
Select 'start' as default in gp info screen.
2014-09-13 00:58:30 +10:00
deve
cca078dbae
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-12 09:03:27 +02:00
deve
e6ab299f37
Fixed mingw compilation
2014-09-12 09:01:35 +02:00
vlj
0b0fabc7bb
Try to merge all MeshFor_Pass
2014-09-12 02:58:13 +02:00
vlj
503ecbb6f1
Some fixes to ligthshaft
2014-09-12 02:27:48 +02:00
Vincent Lejeune
6f65874ab2
Try to disable openMP at runtime
2014-09-12 01:12:55 +02:00
Vincent Lejeune
53fe339fb3
Enable simple culling for non indirect codepath
2014-09-12 01:07:02 +02:00
hiker
bf135095d8
Updated documentation, removed commented out code.
2014-09-12 08:37:03 +10:00
Vincent Lejeune
d79a5aaf01
Fix plunger update in basic glsl mode
2014-09-11 19:44:30 +02:00
Vincent Lejeune
cc4f638ed6
Looks like a wrong rebase
2014-09-11 19:41:16 +02:00
Vincent Lejeune
e6881efbc3
Use a (commented out) faster culling algorithm
2014-09-11 19:34:10 +02:00
hiker
6958539a71
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-11 21:48:44 +10:00
hiker
68e45db8d3
Start to support driving (and rescuing) on physical track objects.
2014-09-11 21:48:03 +10:00
Vincent Lejeune
e19ab67571
Inverse updateAbsolutePosition and Visibility test in scenemanager
2014-09-11 01:08:06 +02:00
Vincent Lejeune
dea23d7a69
Properly reapply HD3000 particle fix
2014-09-10 18:57:40 +02:00
Vincent Lejeune
e77b5dddeb
Revert "Forgot to fix a particle shader for hd3000"
...
This reverts commit 48fcea8ee8 .
2014-09-10 18:57:03 +02:00
Vincent Lejeune
48fcea8ee8
Forgot to fix a particle shader for hd3000
2014-09-10 18:09:38 +02:00
Vincent Lejeune
2e860207d2
Move texture management function in a separate file.
2014-09-10 17:05:08 +02: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
Marianne Gagnon
2672d9b923
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-09 20:47:35 -04:00
Marianne Gagnon
cc3924081a
Fix LOD
2014-09-09 20:47:22 -04:00
Vincent Lejeune
112ae43d03
Remove unneeded if (version/glcap) in shader ctor
2014-09-10 01:49:37 +02:00
hiker
8e12e68425
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-10 09:45:12 +10:00
Vincent Lejeune
8fd97615f3
Fix particle for hd3000
2014-09-10 01:42:51 +02:00
hiker
ae726b0902
Show "?" if a track has no screenshot (instead of the screenshot of
...
the previous track).
2014-09-10 09:39:20 +10:00
Vincent Lejeune
6e6b8e63b6
Inverted logic for compute shaders
2014-09-10 01:37:36 +02:00
Vincent Lejeune
c374beeb10
Disable all extension on OSX
...
OSX does support GL 4.1 + a couple of 4.2 extensions. Since not all 4.2
extensions are present, disable extensions support instead of supporting
several combinaisons of extensions.
2014-09-10 00:20:32 +02:00
vlj
9adda0bfeb
Try to fix OSX
2014-09-09 21:58:53 +02:00
vlj
e8288c139d
Add some documentation to add new material.
2014-09-09 17:48:22 +02:00
vlj
cc141fc992
Factorize matrix block uniform assignment
2014-09-09 17:27:10 +02:00
vlj
fbe2896460
Use non debug gl ctx in non debug build
2014-09-09 16:57:46 +02:00
vlj
a45152b915
Clean some #define
2014-09-09 16:39:28 +02:00
Flakebi
f02c4403e2
Some fixes
2014-09-09 14:12:20 +02:00
Flakebi
9c911a2891
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-09 12:07:34 +02:00
hiker
81da7cc2f7
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-09 13:18:17 +10:00
hiker
1a7b384633
Fixed typo.
2014-09-09 13:14:56 +10:00
Vincent Lejeune
a83ef4ae2e
Preload power up textures
2014-09-09 01:08:38 +02:00
Vincent Lejeune
e8db943dc2
Make computeCameraMatrix faster
2014-09-09 00:52:21 +02:00
vlj
ef89e168f8
Improve fps translation code.
2014-09-08 20:15:11 +02:00
vlj
eaf9d796e8
Fix missing material in basic glsl
2014-09-08 19:27:41 +02:00
vlj
752741307e
Fix transparent in basic glsl pipeline
2014-09-08 19:14:21 +02:00
vlj
5f0b6095ba
Fix basic glsl pipeline
2014-09-08 19:03:04 +02:00
vlj
9a19f6541b
VAOManager: double buffer size when required.
2014-09-08 16:49:48 +02:00
vlj
24a626877a
Use immutable storage for ibo
2014-09-08 16:33:10 +02:00
hiker
52a9993ba3
Minor cosmetic changes.
2014-09-08 21:26:49 +10:00
Vincent Lejeune
68cbe48969
Optimise VAOManager::getBase()
2014-09-08 03:01:50 +02:00
Vincent Lejeune
fee5858959
Do not make handle not resident when deleting GLMesh
...
There is no way to delete an Handle except by deleting underlying
texture so it's fine.
2014-09-08 02:26:48 +02:00
Vincent Lejeune
f3ec623093
Add a profiler marker for buffer upload
2014-09-08 01:33:21 +02:00
Marianne Gagnon
5ac75b915a
Find better names for markers
2014-09-07 18:56:21 -04:00
Marianne Gagnon
01d114329f
Add profiler markers in race update
2014-09-07 18:54:36 -04:00
hiker
abb14c7cab
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-08 08:07:17 +10:00
hiker
e55d3c9896
Removed some unnecessary #includes in .hpp files to reduce compile time.
2014-09-08 08:06:54 +10:00
Vincent Lejeune
ad4dcd9245
Fix new[]/delete[] mismatch
2014-09-07 23:04:30 +02:00
Vincent Lejeune
28fc15640c
Use previous way to detect features
2014-09-07 22:58:13 +02:00
Deve
5692e47739
Set selection to "start" by default in track info screen.
...
Don't start the race using left or right arrow.
2014-09-07 22:52:45 +02:00
Flakebi
f7b22cd97c
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-07 20:17:12 +02:00
Vincent Lejeune
9116431792
Use unordered_map for vaomanager
2014-09-07 20:00:21 +02:00
Vincent Lejeune
af4136f864
Factorize vaomanager in its own file.
2014-09-07 19:58:53 +02:00
Vincent Lejeune
193b588e22
Do not render GI if no RSM.
2014-09-07 19:14:20 +02:00
Vincent Lejeune
e2a9f34186
Clean some unneeded code.
2014-09-07 19:08:10 +02:00
Vincent Lejeune
3617055115
Use tinygettext for fps/polycount/Ktris
2014-09-07 19:03:09 +02:00
Vincent Lejeune
b78cffb432
Remove unneeded omp.h include
2014-09-07 18:39:16 +02:00
Vincent Lejeune
d16e192f75
Fix minimap generation
2014-09-07 18:38:31 +02:00
hiker
803f1260d0
Merge pull request #1509 from konstin/asan
...
fixing crash when running with asan
2014-09-08 01:08:16 +10:00
konstin
30bb8ca2fd
fixing crash when running with asan
2014-09-07 15:57:53 +02:00
hiker
6c8c4de899
Fix windows compilation with new dependency package (libglew only
...
comes with dynamic libs, not static).
2014-09-07 23:09:29 +10:00
Sachith Hasaranga Seneviratne
118db58a02
Merged Master
2014-09-07 11:28:15 +05:30
Vincent Lejeune
9f940770a4
Make frustrum culling calculation parallel
2014-09-07 01:37:06 +02:00
Vincent Lejeune
4822b8a75e
Fix travis
2014-09-07 00:44:56 +02:00
Vincent Lejeune
b9a595e666
Revert "Revert "Use pointer arithmetic to enforce matrix 16 bytes alignment""
...
This reverts commit e83bd11891 .
2014-09-07 00:44:49 +02:00
Vincent Lejeune
e83bd11891
Revert "Use pointer arithmetic to enforce matrix 16 bytes alignment"
...
This reverts commit 0eeeb60685 .
2014-09-07 00:20:35 +02:00
Vincent Lejeune
cbb59fa640
Revert "Fix travis"
...
This reverts commit bdb867bce2 .
2014-09-07 00:20:31 +02:00
Vincent Lejeune
bdb867bce2
Fix travis
2014-09-07 00:17:43 +02:00
Vincent Lejeune
e91a916e14
Try to fix glew initialisation with Mesa
2014-09-07 00:14:34 +02:00
Vincent Lejeune
0eeeb60685
Use pointer arithmetic to enforce matrix 16 bytes alignment
2014-09-07 00:08:47 +02:00
Marianne Gagnon
016ba2caf3
Fix #1499
2014-09-06 17:58:59 -04:00
Vincent Lejeune
27306018d5
Better glew error reporting.
2014-09-06 23:41:29 +02:00
Vincent Lejeune
3d63d5e010
Emit a fatal error if glewInit() failed.
2014-09-06 23:39:51 +02:00
Vincent Lejeune
88f21e2490
Fix RSM
2014-09-06 23:35:00 +02:00
Marianne Gagnon
f0796b2380
Fix #1485 properly
2014-09-06 17:15:19 -04:00
Marianne Gagnon
a6f7c3a152
Add clean way to hide/show ribbon items and use it in GP info screen. Fixes #1485
2014-09-06 17:01:06 -04:00
Marianne Gagnon
14b8e00279
Fix use of unititialized variables in cutscene
2014-09-06 16:24:42 -04:00
vlj
163a3ae7cd
Inverted true/false
2014-09-06 15:07:28 +02:00
vlj
4f60c1b753
Factorize culling code.
2014-09-06 15:03:24 +02:00
vlj
d625bb23cc
Postpone update of nodes
2014-09-06 14:52:08 +02:00
Vincent Lejeune
e0e90f81f4
And another one
2014-09-06 00:02:48 +02:00
Vincent Lejeune
6348537eb9
Fix another warning
2014-09-05 23:59:27 +02:00
vlj
56459f39ab
Use a matrix multiplication
2014-09-05 23:53:38 +02:00
Vincent Lejeune
d6c265daf6
Fix VS warning
2014-09-05 23:51:43 +02:00
Vincent Lejeune
ee8c6daec2
Forget a file in previous commit
2014-09-05 23:51:33 +02:00
Vincent Lejeune
94cd8d5c51
Avoid some useless computation in some vert shaders
2014-09-05 23:41:12 +02:00
Vincent Lejeune
e5f8b39900
Visualise how long pipeline stalls.
2014-09-05 23:21:53 +02:00
Flakebi
5858c05e74
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-05 22:46:17 +02:00
Flakebi
29a78d5cd8
Fix wrong badge display
2014-09-05 22:46:08 +02:00
Vincent Lejeune
6f3f271f44
Merge branch 'libglew'
2014-09-05 22:24:24 +02:00
Vincent Lejeune
1e172dbf33
Fix glowobject frag shader
2014-09-05 22:17:57 +02:00
Vincent Lejeune
93dca486cf
Use bilinear filtering for some textures of displace effect
2014-09-05 21:59:00 +02:00
vlj
781288bf80
Texture storage support detected at runtime.
2014-09-05 18:35:24 +02:00
vlj
d741204ee0
Compute shader support detected at runtime.
2014-09-05 18:35:15 +02:00
vlj
8da557d153
Use GLEW for our GL function support.
2014-09-05 18:21:07 +02:00
vlj
b63654a40c
Detect Glew in CMake
2014-09-05 18:19:10 +02:00
vlj
bc4762be48
Use newer cmake in travis and download libGLEW
2014-09-05 18:19:10 +02:00
vlj
44d50aa8d7
Fix build
2014-09-05 17:56:43 +02:00
Vincent Lejeune
6223f5205b
Add an SSE optimised inverse matrix
2014-09-05 16:42:24 +02:00
vlj
99eea187bb
Use emplace back instead of push_back in scenemanager
2014-09-05 15:38:25 +02:00
vlj
95ea76cc60
Better fix
2014-09-05 03:36:58 +02:00
vlj
cd3df69218
Fix some compiler warning.
2014-09-05 03:33:45 +02:00
Marianne Gagnon
861a76ff55
Minor tweaks to profiler
2014-09-04 20:46:08 -04:00
Vincent Lejeune
e2b361356c
Add a marker for gpu command upload
2014-09-05 02:40:30 +02:00
Vincent Lejeune
5ef03ef4fa
Add 2 new profiler marker.
2014-09-05 02:37:48 +02:00
Vincent Lejeune
aee86fd14f
Use classic buffersubdata for UBO
2014-09-05 02:30:51 +02:00
Vincent Lejeune
3529293b8d
Turn timer query into asynchronous one
2014-09-05 02:26:29 +02:00
Marianne Gagnon
0848087b1d
Fix profiler, do not sync twice per frame
2014-09-04 19:45:16 -04:00
Vincent Lejeune
0d7a425aac
Do not compute shadow/rsm mesh list if not available.
2014-09-05 01:35:38 +02:00
hiker
1c23309161
Merge branch 'master' into gui_screen
2014-09-05 09:18:17 +10:00
hiker
8fd6877e92
Fixed #1486 . Made most menus more consistent (e.g. same position
...
and height for heading).
2014-09-05 08:46:06 +10:00
hiker
6671182efd
Fixed memory leak.
2014-09-04 23:37:38 +10:00
hiker
973399f5cb
Fixed memory leak.
2014-09-04 21:14:37 +10:00
hiker
2514f8a872
Removed unnecessary GUIEngine::.
2014-09-04 17:19:15 +10:00
hiker
b3d1a41276
Removed unused code, added comments.
2014-09-04 17:05:47 +10:00
hiker
8ffe09de29
Combined GPInfoScreen and RandomGPInfoScreen into one class, requiring
...
only one stkgui file.
2014-09-04 16:49:15 +10:00
vlj
9fc8b6ae10
Use unordered_map in scenemanager
2014-09-04 03:58:49 +02:00
Marianne Gagnon
449c6a07b4
fix weird profiler bug, hovering it would change the values. No idea why these changes work
2014-09-03 21:13:07 -04:00
vlj
0a6735a6ec
Simplify culling.
2014-09-04 03:07:00 +02:00
vlj
4482ed6fc8
Remove aggressive culling
2014-09-04 02:41:13 +02:00
vlj
0cf6345bc2
Revert "Remove unnecessary memory barrier"
...
This reverts commit b3ad817999 .
2014-09-04 02:09:11 +02:00
Vincent Lejeune
b28df0f4d0
Fix skybox shader sampler type.
2014-09-04 01:41:10 +02:00
hiker
7c3164a9c1
Added 'reload' random GP support, fixed 'back' icon on screen.
2014-09-04 09:38:25 +10:00
Vincent Lejeune
05f01c70ea
Make m_sync part of irr_driver.
2014-09-04 01:35:08 +02:00
Vincent Lejeune
b3ad817999
Remove unnecessary memory barrier
2014-09-04 01:32:40 +02:00
vlj
059a707196
Fix some uint->float conversion warning.
2014-09-03 23:15:35 +02:00
vlj
25926caef5
Fix GLuint instead of GLuint64 for some handles.
2014-09-03 23:15:26 +02:00
Vincent Lejeune
b3b6b05765
Add profiler counter for rsm
2014-09-03 22:52:16 +02:00
Vincent Lejeune
6f9820b82b
Fix skybox filtering
2014-09-03 22:42:18 +02:00
Vincent Lejeune
df1e87b934
Factorise Skybox shader
2014-09-03 22:38:50 +02:00
vlj
9866ecea29
Enable openMP flags in cmake
2014-09-03 17:18:49 +02:00
vlj
61c350ba96
Merge branch 'scenemanager-optimisation'
2014-09-03 17:12:51 +02:00
deve
e57b927c96
Allow to compile STK on Windows using MinGW compiler.
...
It needs vorbis dll's as additional dependencies.
TODO: add an alternative to inet_ntop function.
TODO: link wiimote library
2014-09-03 14:08:23 +02:00
hiker
12e403b909
Fixed setting of number of AI karts.
2014-09-03 17:19:30 +10:00
hiker
a591ba6778
Fixed setting of reverse in random GPs.
2014-09-03 17:13:20 +10:00
hiker
709583ead5
Removed Random GP dialog.
2014-09-03 17:01:36 +10:00
vlj
2b1c5be315
Use more aggressive culling.
2014-09-03 03:07:45 +02:00
vlj
d51754c237
Fix culling of solid node for good
2014-09-03 02:54:33 +02:00
vlj
55b5194673
Fix culling
2014-09-03 02:41:32 +02:00
vlj
d617e36f22
Fix poly counter with OpenMP
2014-09-03 02:27:47 +02:00
vlj
0bc8befc57
Use Irrlicht culling function
2014-09-03 01:50:23 +02:00
vlj
13e1a40b7b
Remove stkinstancedscenenode.h/cpp
2014-09-03 01:33:52 +02:00
vlj
cf85f97315
Fix crash with RSM
2014-09-03 01:29:24 +02:00
Marianne Gagnon
102e517497
Remove manual LOD code, it's now automatic
2014-09-02 18:54:38 -04:00
hiker
0a0609d91f
Added GrandPrixData::isRandomGP.
2014-09-03 08:24:11 +10:00
hiker
ae01eaf595
Use track->isRaceTrack().
2014-09-03 08:16:52 +10: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
vlj
3083df450f
Gather object in instanced calls
2014-09-02 23:23:23 +02:00
Vincent Lejeune
0fa13334ea
Increase instance buffer size
2014-09-02 20:18:23 +02:00
Vincent Lejeune
dfbae2ea07
Remove instancing
2014-09-02 20:18:22 +02:00
Vincent Lejeune
3cea173ee2
Check for draw indirect support
2014-09-02 20:18:22 +02:00
Vincent Lejeune
96c2c8c6b7
Add glDrawElementsIndirect support
2014-09-02 20:18:21 +02:00
Stephen Just
050d83540c
Use four-channel storage for diffuse/specular RTTs
...
Mesa doesn't seem to support three-channel texture storage, so
increase to four channels. This supposedly will not negatively
impact performance, and may actually improve it depending on the
driver implementation.
See http://www.gamedev.net/topic/560908-is-float-point-fb-possible-with-opengl/
2014-09-02 08:36:06 -06:00
hiker
c8724632e8
Bugfix: only allow races (i.e. no arenas, or cut scenes) in an
...
'all tracks' random GP.
2014-09-02 16:40:26 +10:00
hiker
c8500b65cb
Fixed compiler warning.
2014-09-02 16:40:00 +10:00
Flakebi
a31ec772ff
Replace accidently placed tabs
2014-09-02 03:57:48 +02:00
Flakebi
48323d4456
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-02 03:57:21 +02:00
Flakebi
a84c5d596c
Fix focus crash in kart selection screen
2014-09-02 03:43:08 +02:00
hiker
6982e3d0ae
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-02 09:52:15 +10:00
hiker
06915cc354
Fix compilation on very old mesa versions. vlj, please check.
2014-09-02 09:51:30 +10:00
hiker
7dbfc151bf
Added random GP functionality into gp_info screen. Changed GPData
...
in GPInfoScreen from a pointer to be an object, while this adds
some coping of this object, it removes potential memory leaks.
2014-09-02 09:32:12 +10:00
Vincent Lejeune
480d281f52
Fix crash reported when using plunger.
2014-09-02 01:19:34 +02:00
Flakebi
e2089fcea6
Switch per player difficulty to player config
2014-09-02 01:18:58 +02:00
Vincent Lejeune
0b0cf09dd6
Try to fix build
2014-09-02 01:08:08 +02:00
Flakebi
70ad37aeb7
Fix crash in multiplayer kart selection screen
2014-09-01 22:57:58 +02:00
Flakebi
44add00944
Rename icons to more generic names
2014-09-01 22:21:17 +02:00
Deve
57240124ba
Rename rain class to weather
2014-09-01 20:18:06 +02:00
Deve
7d0dec5c49
Handle lightning and sound in weather property
2014-09-01 20:18:06 +02:00
Flakebi
8c40f279cd
Add break_time_increase to perPlayerDifficulty
2014-09-01 11:31:39 +02:00
Flakebi
dc4a30202f
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-01 11:31:26 +02:00
auriamg
27fb1f6254
Merge pull request #1493 from marcoll/master
...
Reset the scroll offset when clearing a dynamic ribbon widget
2014-08-31 19:05:06 -04:00
Marc Coll Carrillo
76b4f929df
Reset the scroll offset when clearing a dynamic ribbon widget
2014-08-31 17:54:40 +02:00
Marianne Gagnon
fd1f2537d4
Modify LOD node to use cleaner technique
2014-08-30 21:24:16 -04:00
vlj
5c1b24b4e4
Factorise a common interface to stkmeshscenenode/animatedmesh
2014-08-31 01:18:54 +02:00
Deve
47b46558f2
A bit better formatting in world status
2014-08-30 18:37:57 +02:00
Deve
507d9566a0
Don't start rain sound too early
2014-08-30 18:37:57 +02:00
Deve
d8f61e336e
Move creating rain to world class because now it doesn't depend on cameras.
2014-08-30 18:37:57 +02:00
Deve
52384f151c
Merge pull request #1490 from fenicks/master
...
Add libxrandr-dev in Ubuntu dependencies command example.
2014-08-30 12:30:37 +02:00
Christian Kakesa
e791ca82f1
Add libxrandr-dev in Ubuntu dependencies command example.
2014-08-30 12:16:42 +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
vlj
af4575f6db
Fix crash on nvidia linux
2014-08-30 01:03:01 +02:00
vlj
fc80ebbbcb
Use storage buffer for vao manager
2014-08-29 21:59:05 +02:00
vlj
1e1ba34f45
Use a separate update() member
2014-08-29 21:59:04 +02:00
Deve
61d70ea599
Add rain sound
2014-08-29 21:54:17 +02:00
Deve
5a937d6f12
Fixed creating rain class
2014-08-29 21:54:17 +02:00
Vlj
537d435f7f
Add some compile time check
2014-08-29 21:29:18 +02:00
Deve
50319c7c58
Check if user config dir exists
2014-08-29 21:12:00 +02:00
Vincent Lejeune
99b110cc99
Use uvec2 instead of sampler2D
2014-08-29 01:30:19 +02:00
hiker
4ba8e85169
Give the race setup screen a background box and added a text for difficulty.
2014-08-29 07:42:42 +10:00
vlj
ae18730c92
Use ATI instead of AMD in vendor name.
2014-08-28 22:08:56 +02:00
vlj
5878cb35ec
Implement runtime detection of srgb bindless fix
2014-08-28 22:02:12 +02:00
Vincent Lejeune
a3b8494ad5
Remove Base Vertex/Offset if base instance is unavailable
2014-08-27 22:27:06 +02:00
Vincent Lejeune
998b5a89ac
Fix transparents
2014-08-27 19:32:45 +02:00
Vincent Lejeune
5a212989df
Fix build on travis
2014-08-27 17:44:24 +02:00
vlj
00049f2f04
Init texture only once, not each frame
2014-08-27 17:22:59 +02:00
hiker
2a5591ad1f
Enable continue button.
2014-08-27 22:57:03 +10:00
hiker
db3db6f8b5
First version of the GP info screen (instead of dialog).
2014-08-27 22:08:50 +10:00
hiker
46396f4a7e
Fix #1484 (crash on windows in release mode).
2014-08-27 13:46:42 +10:00
Vincent Lejeune
4cb8955f83
Free texture memory when an object is destroyed
2014-08-26 23:58:42 +02:00
Vincent Lejeune
a1ec19e672
Factorise AZDO related code
2014-08-26 23:52:48 +02:00
vlj
53c52470ee
Use one call for each shadow cascade instead of a big one.
2014-08-26 21:56:16 +02:00
Vincent Lejeune
4f411ccdb1
Fix spheremap shader
2014-08-26 21:05:43 +02:00
Vincent Lejeune
264a9dbe46
Do not split animated mesh from static list
2014-08-26 20:45:55 +02:00
Vincent Lejeune
bf5410b793
Add unlit instanced shader
2014-08-26 20:34:59 +02:00
Vincent Lejeune
cad1efbff1
Add instanced detail shader
2014-08-26 20:34:37 +02:00
Vincent Lejeune
0960f090dc
Add instanced spheremap shader
2014-08-26 20:34:26 +02:00
hiker
672ec8e5e8
Fixed crash: m_tracks is NULL, and can't be used to get the default
...
number of laps here.
2014-08-26 16:39:54 +10:00
hiker
b029c3e990
Fixed setting of actual number of laps of a track; cleaned up docs.
2014-08-26 16:37:06 +10:00
hiker
c9fb0c5b16
Removed unnecessary include.
2014-08-26 16:36:05 +10:00
Deve
4b597b97b7
Fixed path to data directory on linux.
...
Ideally we should use relative paths, which could make possible to run the game after using:
make install DESTDIR=./any/local/path
I also added path to "supertuxkart-assets" directory, which cmake already search.
2014-08-25 21:53:24 +02:00
Vincent Lejeune
0b4532b6da
Implement AZDO
2014-08-25 17:30:03 +02:00
hiker
e309008736
Use header font for title, removed second 'back' button.
2014-08-25 23:16:59 +10:00
hiker
48ac661af7
Merge remote-tracking branch 'origin/master' into gui_screen
2014-08-25 22:23:14 +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
8f3bff10f8
If minimum or maximum is set for a spinner widget, automatically
...
adjust the value if its too low or high.
2014-08-25 21:57:43 +10:00
hiker
4b507a4eda
Made more space for credits that span more than one line.
...
Siwtch left and right side of the top screen.
2014-08-25 11:12:00 +10:00
hiker
c9936ffb97
Forgot to actually add the new files :(
2014-08-25 10:47:36 +10:00
hiker
0de942b5f3
Alpha version of a track info screen (instead of a dialog).
2014-08-25 10:40:37 +10:00
hiker
bf23f31a10
Fixed typo.
2014-08-25 10:33:29 +10:00
hiker
aef5b3aaea
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-25 10:30:12 +10:00
Vincent Lejeune
805d35a5e6
Do not draw twice the second pass instanced mesh
2014-08-25 02:17:23 +02:00
Vincent Lejeune
55346185d7
Fix instancing without base instance support
2014-08-25 02:13:01 +02:00
Vincent Lejeune
f3752a03f0
Enable arb debug output on all non apple platform
2014-08-25 01:53:05 +02:00
Vincent Lejeune
44de38bf10
Pack instanceData
2014-08-25 01:45:33 +02:00
Vincent Lejeune
b401d1e082
Push empty InstanceData independently of gl level
2014-08-25 01:09:52 +02:00
Vincent Lejeune
aa6e3570df
Fix attempt for crash.
2014-08-25 00:40:19 +02:00
Deve
0fa38161b5
Install icons in $PREFIX/share/icons/hicolor path.
...
Don't use static paths in .desktop file. Actually I don't know about any application which uses it :P
2014-08-24 21:58:34 +02:00
Vincent Lejeune
7bff68870c
Read sampler from attributes.
2014-08-24 21:50:59 +02:00
Deve
db53dd6767
xrandr: Simplify code a bit.
...
Fixed some memory leaks.
2014-08-24 17:40:40 +02:00
vlj
4a62fd7968
Use an instance manager
2014-08-23 19:53:54 +02:00
Vincent Lejeune
a0b376f04d
Fix some warnings
2014-08-23 18:53:38 +02:00
hiker
16b88d13db
Fixed compiler warning.
2014-08-23 12:10:12 +10:00
hiker
fbc438b998
Fixed error message to correctly say that online user names needs to
...
be at least 3 characters long - though at this stage we need to
wait for the server to be updated as well, since it will now reject
a shorter user name.
2014-08-23 09:56:30 +10:00
hiker
5b633f0487
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-23 09:50:39 +10:00
Vincent Lejeune
6ac3d69471
Play with bindless textures
2014-08-22 23:48:28 +02:00
vlj
bc24c4558f
Register some api functions
2014-08-22 23:48:14 +02:00
Deve
90ecf50414
Show console on windows only in debug mode
2014-08-22 20:40:22 +02:00
Deve
8711955bdc
Fixed onEscapePressed event in addons loading screen.
...
It actually was unused previously. I'm also not sure why there was assert(false) ?
2014-08-22 19:59:30 +02:00
Deve
ad870c37f4
Back to previous resolution when escape was pressed in confirm resolution dialog
2014-08-22 19:46:03 +02:00
hiker
52a7d071dd
Fixed some Log:: messages that used incorrect syntax and did not print
...
some variables. Made all log:: messages use the same components 'addons'.
2014-08-22 16:34:18 +10:00
hiker
3ef30dfd48
Merge branch 'no_floating'
2014-08-22 12:46:10 +10:00
hiker
80e1effccf
Added some debug output to get more info for #1464 (unnecessary download
...
of addon icons). To be removed later.
2014-08-22 12:44:46 +10:00
hiker
84e78d884a
Merge remote-tracking branch 'origin/master' into no_floating
...
Conflicts:
src/karts/kart.cpp
2014-08-22 12:23:55 +10:00
hiker
0e23c54562
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-22 12:15:14 +10:00
hiker
f0f4b8d9f6
Improved error message.
2014-08-22 12:14:06 +10:00
Vincent Lejeune
b5273d6426
Port gaussian17*shader (non compute) to TextureRead.
2014-08-22 02:21:20 +02:00
Vincent Lejeune
dc35efa9d7
Port nvidia workaround to TextureRead
2014-08-22 02:08:05 +02:00
hiker
c3821e703b
Made line endings consistent.
2014-08-22 09:49:55 +10:00
Vincent Lejeune
5c879b623f
Fix pointlight call
2014-08-22 00:47:19 +02:00
Vincent Lejeune
547018f0ab
Port PointLight shader
2014-08-22 00:30:14 +02:00
Vincent Lejeune
cee48821d3
Port diffuse env map shaders
2014-08-22 00:20:04 +02:00
Vincent Lejeune
062bcb1ff0
Fix gl debug output rant about uninitialised sync
2014-08-21 23:31:45 +02:00
Vincent Lejeune
187c9fca85
Port SunLight to TextureRead
2014-08-21 23:29:40 +02:00
Vincent Lejeune
c38a26b92a
Use a separate rtt for diffuse/specular
2014-08-21 23:26:16 +02: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
hiker
c6f7448911
Use sqrt(speed) to scale the collision impulse, which results in
...
weaker impulses when hitting the terrain.
2014-08-21 22:34:51 +10:00
hiker
1179ebf4e9
Fix suspension to some more realistic values.
2014-08-21 21:33:26 +10:00
hiker
15cccf9301
Make the graphical y offset configurable (and basically disable
...
it for now by setting it to 0).
2014-08-21 17:28:06 +10:00
hiker
171b442ae6
Removed artificial Y offset to allow evaluation of more karts.
2014-08-21 09:59:29 +10:00
hiker
856eb747b4
Fixed shadows with a hack.
2014-08-21 08:01:54 +10:00
Stephen Just
78df1bf371
Fix hasGLExtension on Windows.
...
Windows requires loading the glGetStringi function explicitly.
Also included fallback for when it is not found.
2014-08-20 14:38:49 -06:00
Marianne Gagnon
c8b50c67ef
Fix leak
2014-08-20 20:38:05 -04:00
Vincent Lejeune
d968ce11bf
Add a function that kills shaders and use it when reloading shader.
...
Thus there is no mesh corruption.
2014-08-21 02:19:33 +02:00
Vincent Lejeune
5abc404ed9
Use stream_copy for tfb buffers.
2014-08-21 01:17:16 +02:00
Vincent Lejeune
dd1f0739f0
Properly clean program object in load shader function.
2014-08-20 23:30:25 +02:00
Vincent Lejeune
06df2d12c7
Forgot to free a temp array.
2014-08-20 23:16:20 +02:00
Vincent Lejeune
04f6c7e729
Use singleton template for VAOManager (ex VBOGatherer)
2014-08-20 23:08:04 +02:00
Deve
c2cf83bb6a
xrandr: move restore resolution to separated function because it makes a mess...
2014-08-20 19:44:06 +02:00
Deve
56fa56a38f
xrandr: don't restore resolution if output was disconnected during game
2014-08-20 19:44:06 +02:00
Deve
5c4c54bf20
xrandr: make sure that output_id and old_mode are declared
2014-08-20 19:44:06 +02:00
hiker
210a8e7ae9
Set the graphical suspension depending on physical suspension (capped).
...
Adjusted graphical chassis to be 0.1 higher to have similar look at previously
and avoid graphical chassis going into terrain,
2014-08-20 22:19:26 +10:00
hiker
e95536c265
Fixed height computation. Moved adding of gravity center
...
shift, which probably fixed the problems we had with
'wheels inside kart chassis' tests earlier.
2014-08-20 21:35:22 +10:00
hiker
4a028afb8f
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-20 21:25:15 +10:00
hiker
4228fbb0d4
Temporary fixed windows compilation (glGetStringi not known). Needs
...
a proper fix!!
2014-08-20 21:24:20 +10:00
hiker
6073788813
Fix linux compilation (no nullptr).
2014-08-20 21:07:12 +10:00
Deve
6a48010644
Fixed compilation error with disabled xrandr
2014-08-20 06:49:38 +02:00
Stephen Just
6b3786457f
Fix OpenGL extension detection on Linux/Mesa.
...
Created function in glwrap to test whether a GL extension is available.
This required using OpenGL3's glGetStringi. Backwards compat code can
be added to function if necessary.
2014-08-19 16:19:38 -06:00
vlj
160d4ae432
Merge branch 'texture-factorization'
2014-08-20 02:54:54 +02:00
vlj
fc945a429f
Another place found
2014-08-20 02:46:48 +02:00
vlj
d11d56f6cd
Replace std::vector<GLuint>{...} in post_processing
2014-08-20 02:42:59 +02:00
vlj
7de6b7adcd
Use createVector in others places
2014-08-20 02:21:34 +02:00
vlj
4197e2c320
Another ifdef sets...
2014-08-20 02:05:16 +02:00
vlj
5559a9fd1d
Add some #if !defined(APPLE) in debug screen
2014-08-20 02:02:34 +02:00
vlj
b3e6ed03b1
Use VERSION_3_3 macro
2014-08-20 01:56:16 +02:00
vlj
af4fdaf96b
Add "functionnal" include in debug.cpp
2014-08-20 01:56:04 +02:00
vlj
953dd9db0d
Put some others bunch of code between ifdef win32
2014-08-20 01:48:28 +02:00
Marianne Gagnon
ffd558e577
Merge branch 'texture-factorization' of https://github.com/supertuxkart/stk-code into texture-factorization
...
Conflicts:
src/graphics/post_processing.cpp
2014-08-19 19:45:24 -04:00
Marianne Gagnon
5788073b17
osx fixes
2014-08-19 19:44:27 -04:00
vlj
ef95f5703a
Add createVector in another place.
2014-08-20 01:37:50 +02:00
vlj
d0e22164d5
Add some ifdef for OSX
2014-08-20 01:31:11 +02:00
vlj
190aed6219
Use createVector in some others places
2014-08-20 01:27:26 +02:00
vlj
a28f4d26b4
Add a "createVector" function for OSX
2014-08-20 01:13:39 +02:00
vlj
af9c3d53b7
Use template to declare shader texture usage.
2014-08-19 22:06:49 +02:00
vlj
2a473a550a
Remove wrappers.
2014-08-19 17:30:44 +02:00
vlj
92e5126ebf
Fix travis ci
2014-08-19 17:16:27 +02:00
Vincent Lejeune
4641854c49
Factorize gl headers include in a separate file.
...
It should avoid conflict with Xorg headers
2014-08-19 17:01:45 +02:00
vlj
5128ab920b
Fix build
2014-08-19 17:01:32 +02:00
Vincent Lejeune
30c91217a7
Factorize gl headers include in a separate file.
...
It should avoid conflict with Xorg headers
2014-08-19 16:52:49 +02:00
vlj
bd7ec06d49
Fix build
2014-08-19 16:52:43 +02:00
Vincent Lejeune
da843cc8c1
Add sampler object support
2014-08-19 02:36:06 +02:00
vlj
bdd7951c46
Split animated meshes list from the others
2014-08-19 02:35:51 +02:00
Marianne Gagnon
9af41a5166
Add actual light under thunderbird
2014-08-18 20:01:45 -04:00
Vincent Lejeune
da90ea491e
Unlit material supports tex matrix
2014-08-19 01:36:06 +02:00
auriamg
fcbc41171e
Merge pull request #1463 from konstin/gp_editor_laps
...
small improvements to the gp editor
2014-08-18 19:04:43 -04:00
Deve
0dc34b2c0d
xrandr: few more checks
...
- try to run in windowed mode if no output was found
- close display correctly in case of no output
- add few warnings
2014-08-18 20:56:30 +02:00
konstin
33686e9abc
make gp editor use default number of laps
2014-08-18 15:16:53 +02:00
konstin
e400b5c212
improve readability
2014-08-18 15:15:22 +02:00
konstin
2f6424c3a2
replace unecessary NULL-checks
2014-08-18 15:11:51 +02:00
hiker
fe62df253d
Exit quicker if a request is being executed when stk is quit.
2014-08-18 22:43:26 +10:00
hiker
b2a936c8cd
Fix crash caused when downloading requests for icons were still
...
executing at game end.
2014-08-18 22:42:27 +10:00
Marianne Gagnon
fcb80cdb2c
Update thunderbird to have new-engine-friendly traffic light animation
2014-08-17 19:33:45 -04:00
Marianne Gagnon
83a1acc961
Merge branch 'save_gp'
2014-08-16 15:42:46 -04:00
Marianne Gagnon
9992f3afa6
bugfix
2014-08-16 15:42:35 -04:00
Marianne Gagnon
5ed8358505
Misc fixes, null crash on invalid billboards, some non-weather particle emitters incorrectly created with Y randomization
2014-08-16 15:26:39 -04:00
Deve
3e3a27252a
xrandr: fixed memory leak
2014-08-16 16:02:22 +02:00
Deve
a9bd12bfab
xrandr: use primary output if window manager reports this information
2014-08-16 12:21:55 +02:00
Deve
990a297154
Get real width and height of best fit resolution only if resolutions list is not empty.
2014-08-16 12:21:55 +02:00
hiker
8c525ab2d4
Make the physics settings configurable, but default to use the old
...
settings for now.
2014-08-16 10:20:24 +10:00
hiker
6d5651f357
Test to see if the physics work better.
2014-08-16 09:44:00 +10:00
Marianne Gagnon
af33992691
Remove accidentally added file
2014-08-15 18:34:59 -04:00
vlj
8b81d0ac3f
Map UBO to change its value.
2014-08-16 00:33:47 +02:00
vlj
5f6d0bd63c
Use stream storage for ubo
2014-08-16 00:19:45 +02:00
vlj
cbd77b469c
Do not use srgb fbo if ubo workaround is enabled.
2014-08-15 22:06:05 +02:00
Sachith Hasaranga Seneviratne
7e3143424e
Cleaned Vec3 binding somewhat
2014-08-15 21:55:14 +05:30
Sachith Hasaranga Seneviratne
84d3802f08
Merge branch 'master' of https://github.com/supertuxkart/stk-code into se
2014-08-15 21:47:09 +05:30
Sachith Hasaranga Seneviratne
700a59f226
Added some comments to track script functions
2014-08-15 21:46:03 +05:30
Sachith Hasaranga Seneviratne
f01b69f901
Formatted script_physics.hpp
2014-08-15 21:39:36 +05:30
Sachith Hasaranga Seneviratne
cced247b4c
Added comments to physics script functions
2014-08-15 21:37:48 +05:30
Sachith Hasaranga Seneviratne
772c923263
Added comments to kart script functions
2014-08-15 21:35:20 +05:30
Sachith Hasaranga Seneviratne
635d05af5e
Added some comments to scriptengine.cpp
2014-08-15 21:27:39 +05:30
vlj
f77695c098
Add Tangent/Bitangent in instanced object shader.
2014-08-15 17:15:19 +02:00
Deve
d45429bf88
First destroy the window, then restore resolution.
...
This may solve some possible issues with WM fullscreen.
2014-08-15 11:34:16 +02:00
Sachith Hasaranga Seneviratne
4cea7ee2d9
Merge branch 'master' of https://github.com/supertuxkart/stk-code into se
2014-08-15 06:42:10 +05:30
Vlj
7fbe529e6f
Forget to add Tangent/BiTangent with pre 330
2014-08-15 02:14:30 +02:00
Vlj
647a5d6990
Fix skybox generation with non square textures
2014-08-15 02:14:30 +02:00
Marianne Gagnon
0a95344a01
Fix potentiel crash
2014-08-14 19:54:35 -04:00
Marianne Gagnon
c425e7e153
Also export GPU markers to CSV
2014-08-14 19:41:33 -04:00
Marianne Gagnon
58f509d953
Fix vlj's profiler code, only worked in single player
2014-08-14 19:08:21 -04:00
Vlj
d3ec1a27ce
Completly unroll the loop
2014-08-15 00:02:43 +02:00
Vlj
4829b8ddd8
Manually unroll rh shader
2014-08-14 23:58:11 +02:00
Vincent Lejeune
07bff38427
Fix a typo.
2014-08-14 21:45:31 +02:00
Vincent Lejeune
f9c692052e
Try a fix for nvidia and GI
2014-08-14 21:26:16 +02:00
vlj
49779d36bf
Do not update mesh in shadow pass.
...
It may introduce some 1 frame latency between shadows and geometry but
in practice it's not noticeable.
2014-08-14 18:55:21 +02:00
vlj
33e3b43346
Add a (quite big) timeout to sync.
2014-08-14 18:40:14 +02:00
Vlj
8ec4fb6308
Use sync object
2014-08-14 18:12:15 +02:00
vlj
18981ff943
Set unsynchronized bit in transparent pass
2014-08-14 16:29:59 +02:00
vlj
1c7fe8c518
Use mapbuffer to modify animated mesh buffer content.
2014-08-14 16:14:36 +02:00
vlj
6ef8f666ee
Add mapbuffer glfunction.
2014-08-14 16:06:42 +02:00
vlj
d1f83c0334
Properly clean/regen vbo in updatevbo()
2014-08-14 14:27:18 +02:00
vlj
9840650038
Update some data usage hint.
2014-08-14 14:11:04 +02:00
Sachith Hasaranga Seneviratne
e9fc465a32
changed back to working version
2014-08-14 15:57:25 +05:30
vlj
21683251a2
Fix shadow lod level in singleplayer
2014-08-14 02:43:01 +02:00
hiker
52fba7958a
Fixed pre-2011 compilation.
2014-08-14 10:24:23 +10:00
hiker
3521368112
Oops - committed file with typo :(
2014-08-14 10:21:26 +10:00
hiker
27155b5543
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-14 10:19:54 +10:00
Marianne Gagnon
a5f36ec412
Add new particles flag for vlj
2014-08-13 20:23:21 -04:00
hiker
f338282a15
Merge branch 'master' of github.com:supertuxkart/stk-code
...
Conflicts:
src/graphics/stkinstancedscenenode.cpp
2014-08-14 10:19:31 +10:00
Marianne Gagnon
1de0e50607
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-08-13 20:10:28 -04:00
Marianne Gagnon
5c3c7afeae
Fix bogus cast resulting in reading random URL in particles
2014-08-13 20:10:02 -04:00
vlj
5f78f2687f
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-08-14 02:09:15 +02:00
vlj
9120d792be
Fix GPUTimer
2014-08-14 02:09:12 +02:00
Marianne Gagnon
ba3027b6bb
Little improvement to for_in macro. Still only works on PtrVector though
2014-08-13 19:47:59 -04:00
hiker
86ea16bd43
Fixed compilation for pre-C++-2011 compilers.
2014-08-14 09:38:31 +10:00
vlj
47e176d4a3
User wrong VS for instanced normal
...
Also fix the srgb normal map.
2014-08-14 00:55:12 +02:00
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
Vlj
3e277f8edf
Dont alloc quaternion buffer if not flip
2014-08-13 23:56:27 +02:00
Vlj
c7a4d45d08
Fix malloc/delete mismatch
2014-08-13 23:52:47 +02:00
Vincent Lejeune
b5016ba85e
Factorise simulation code.
2014-08-13 22:47:03 +02:00
Vincent Lejeune
00e945e75c
Port heightmap simulation shader.
2014-08-13 22:42:02 +02:00
Vincent Lejeune
47cfe08fe1
Port simple simulation particle shader.
2014-08-13 22:32:15 +02:00
Vincent Lejeune
8117260bf6
Factorise attribute location of simulation program.
2014-08-13 22:26:52 +02:00
Vincent Lejeune
e6eac5b57f
Clean quaternionbuffer at the right place.
2014-08-13 22:02:18 +02:00
Vincent Lejeune
f43538aad7
Factorize again code in gpuparticle.
2014-08-13 21:59:57 +02:00
Vincent Lejeune
b5f89501f6
Factorize some GL code in gpuparticle.
2014-08-13 21:38:33 +02:00
samuncle
a91bcfa746
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-08-13 21:32:12 +02:00
samuncle
d1f46fdb7f
Bring back the rain
2014-08-13 21:30:27 +02:00
Vincent Lejeune
013e823408
Extract ParticleVBO from gpuparticle.cpp
2014-08-13 21:13:28 +02:00
Vincent Lejeune
dc02eec7b6
Port particle rendering shaders too.
2014-08-13 21:04:03 +02:00
Vincent Lejeune
22137eee88
Port UI shaders.
2014-08-13 20:25:56 +02:00
Deve
7a9e77da01
Exit cmake with error if xrandr library was not found.
2014-08-13 19:34:53 +02:00
Vincent Lejeune
dc9993d780
Add Debug for instanced vertex type mismatch.
2014-08-13 19:28:02 +02:00
Vincent Lejeune
70b0fce50c
Add support for instanced normal map mesh.
2014-08-13 19:20:40 +02:00
Vincent Lejeune
ebacfcfcef
Put RSM draw in its own method.
2014-08-13 18:59:30 +02:00
Vlj
fda6aac5dd
Reenable shadows for instanced mesh
2014-08-13 17:33:10 +02:00
hiker
de16d1ace3
Bugfix: A new local only user was now able to change the online account.
...
If a new account is created with an online account, make the online account
the default.
2014-08-13 21:46:53 +10: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
ce5d09f159
Move instanced rendering code to render_geometry.cpp
...
Shadows are disabled temporary
2014-08-13 04:11:44 +02:00
hiker
98bb7e3959
Merge branch 'bumpy'
2014-08-13 11:16:03 +10:00
hiker
5a67fa50a9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-13 11:15:49 +10:00
Vincent Lejeune
292aa0cbc4
Factorize FullScreen shaders invocations.
2014-08-13 02:01:29 +02:00
Vincent Lejeune
955e0d3259
Move RHDebug code to post process
2014-08-13 01:21:48 +02:00
Marianne Gagnon
345a3bc451
Fix logic in video settings popup
2014-08-12 19:18:38 -04:00
Vincent Lejeune
03a6499c27
Port RHDebug and Passthrough Layer
2014-08-13 01:13:41 +02:00
hiker
c5a1d8bf34
Merge branch 'fix-camera' into bumpy
2014-08-13 08:55:16 +10:00
hiker
d26547aa16
Try to stop the karts from hovering.
2014-08-13 08:53:31 +10:00
Vincent Lejeune
0dd1fd605c
Port MLAA Shaders
2014-08-13 00:51:32 +02:00
Vincent Lejeune
b0d63ab399
Fix windows build
2014-08-13 00:21:43 +02:00
Vlj
465e52713e
Port passthrough and glow shaders
2014-08-13 00:08:02 +02:00
Vlj
c3cead9f9c
Port Bloom shaders.
2014-08-12 23:45:56 +02:00
Vlj
d8e4a352ba
Port gaussianV shaders
2014-08-12 23:20:03 +02:00
Vlj
be52d07418
Port motion blur and GaussianH shaders
2014-08-12 21:14:37 +02:00
Vlj
483ad109e3
Return of the ASAN option
2014-08-12 20:19:31 +02:00
Vlj
44c03ce99d
Port light shaft shaders
2014-08-12 19:55:01 +02:00
vlj
9dd2021f8d
Factorize List* related code.
2014-08-12 19:18:01 +02:00
vlj
838bb4fa7c
Clean some code.
2014-08-12 18:57:54 +02:00
vlj
d6015c12af
Revert "Factorize tuple remap."
...
This reverts commit 8c032a7df6 .
2014-08-12 16:38:47 +02:00
vlj
d9be494db1
Revert "Use function object when unrolling args."
...
This reverts commit c5216e7cff .
2014-08-12 16:38:43 +02:00
vlj
05a63ac595
Revert "Factorize render pass code"
...
This reverts commit 10ce84fe46 .
2014-08-12 16:38:38 +02:00
vlj
a4955325fd
Revert "Try to fix travis-ci"
...
This reverts commit 8fa0cdb543 .
2014-08-12 16:38:04 +02:00
vlj
36b791c515
Revert "Another attempt at fixing travis ci"
...
This reverts commit e85aced13b .
2014-08-12 16:37:58 +02:00
vlj
a7a631a2c3
Revert "Forgot the 'D'"
...
This reverts commit aef8da48af .
2014-08-12 16:37:45 +02:00
hiker
7a5629350c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-12 08:54:38 +10:00
Vlj
f633736dcc
Remove AddressSanitizer build, it doesnt work.
2014-08-12 00:54:14 +02:00
Vlj
aef8da48af
Forgot the 'D'
2014-08-12 00:45:22 +02:00
Vlj
e85aced13b
Another attempt at fixing travis ci
2014-08-12 00:38:43 +02:00
Vlj
0a6a85ea61
Use AddressSanitizer in debug build
2014-08-12 00:32:24 +02:00
Vlj
8fa0cdb543
Try to fix travis-ci
2014-08-12 00:20:55 +02:00
Vlj
10ce84fe46
Factorize render pass code
2014-08-12 00:05:46 +02:00
vlj
c5216e7cff
Use function object when unrolling args.
2014-08-11 23:15:27 +02:00
vlj
8c032a7df6
Factorize tuple remap.
2014-08-11 22:57:07 +02:00
vlj
671ab38d18
Inverted uniform names.
2014-08-11 22:03:03 +02:00
Vlj
23df4c99dd
Fix
2014-08-11 21:21:58 +02:00
Vlj
1afe0fa4ee
Port some shaders
2014-08-11 20:50:10 +02:00
hiker
11f3c1fc11
Added the recovery dialog back in :)
2014-08-11 22:39:08 +10:00
hiker
40224a85f6
For old server change actions change-password to change_password
...
and 'recover' to 'recovery'. Removed unused API::VERSION.
2014-08-11 21:56:13 +10:00
hiker
3f5ab358df
Merge branch 'leyyin'
2014-08-11 14:22:30 +10:00
hiker
93fcb9a2a7
Added server-version configuration, which supports the GSOC server (version 2).
...
Made version 1 compatible with the 0.8.1 stkaddon server (i.e. all commands
are sent to client-user.php, and receive the actual command as 'action' parameter).
2014-08-11 14:10:01 +10:00
hiker
7684ee74bd
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-11 13:20:07 +10:00
Marianne Gagnon
2c1feb5f06
Improve debug values popup
2014-08-10 19:09:44 -04:00
hiker
940a296366
Merge remote branch 'origin/master' into leyyin
2014-08-11 09:05:34 +10:00
hiker
42453325c4
Increased impule to keep kart parallel a bit more, changed the bevel shape
...
to be slighlty longer.
2014-08-11 09:02:45 +10:00
hiker
a8189eccfc
Increase impulse to keep the kart parallel (to avoid the kart being
...
90 degrees on its side and not being able to get straight again).
2014-08-11 08:10:04 +10:00
vlj
495cd25d1c
Do some symetry on skybox top/bottom..
2014-08-10 23:15:02 +02:00
vlj
856169794d
Use singleton for DoF.
2014-08-10 22:27:26 +02:00
vlj
0f5effc2d9
Use collision shape for RSM size.
2014-08-10 22:05:00 +02:00
hiker
4d1d4492b1
Removed support for non-bevelled shapes (has not been used in years).
...
Fixed position of physical (raycast) wheels to be in (or on the edge)
of the collision body, not outside. Removed support for defining
kart-specific physical kart position (was never used).
2014-08-10 21:54:18 +10:00
Marianne Gagnon
b2e08c94a7
Fix physics of instanced nodes
2014-08-09 21:22:12 -04:00
Vincent Lejeune
e6b558262b
Do not display grass normal
...
It requires taking account of the wind, ie another shader.
2014-08-09 21:37:31 +02:00
Vincent Lejeune
020e939e2b
Normalize normals in normal view.
2014-08-09 21:24:50 +02:00
Vincent Lejeune
c546b25ae9
Fix perspective in normal view.
2014-08-09 21:19:26 +02:00
Vincent Lejeune
c07aed260a
Visualize vertex normals in normal view.
2014-08-09 21:09:31 +02:00
Vincent Lejeune
bcc2196ccf
Fix SSAO on splatting material.
2014-08-09 20:05:49 +02:00
konstin
f3d0d3cf4e
better comments
2014-08-09 19:56:01 +02:00
vlj
768d51d0c3
Add sliders to change ssao parameters.
2014-08-09 19:22:30 +02:00
vlj
496269e73b
Make SSAO param changeable.
2014-08-09 18:51:52 +02:00
konstin
c59f243550
Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp
2014-08-09 17:06:16 +02:00
Vincent Lejeune
41cca2e56e
Fix ambient handling.
2014-08-09 01:41:30 +02:00
Vincent Lejeune
54c9f32033
Store ambientlight directly in irr_driver.
2014-08-09 01:30:36 +02:00
Vincent Lejeune
c8a9515ad0
Use debug slider to change ambient on the fly.
2014-08-09 01:10:19 +02:00
Vincent Lejeune
5dffc86d26
Use lambda for debug_slider instead.
2014-08-09 00:43:28 +02:00
Vincent Lejeune
281fceee0b
Revert "Try to use lambdas."
...
This reverts commit cdb760ae51 .
2014-08-09 00:36:12 +02:00
Deve
99ce91dc46
Strength of bouncy edges should depend on soccer ball mass.
2014-08-08 23:07:03 +02:00
vlj
cdb760ae51
Try to use lambdas.
2014-08-08 21:46:55 +02:00
hiker
4d085a134c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-08-08 11:14:47 +10:00
hiker
f39e22e442
Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin
2014-08-08 11:10:56 +10:00
Vincent Lejeune
5ba2f6c97b
Inadvertantly inverted RSM and model matrixes.
2014-08-08 01:47:29 +02:00
Vincent Lejeune
8db09a55cd
Add Splatting RSM shader type.
2014-08-08 01:07:55 +02:00
vlj
60f76ee612
Fix RSM
2014-08-07 22:45:25 +02:00
vlj
6c3aeceb51
Fix GI
...
It was using wrong swizzle for depth texture.
2014-08-07 22:32:42 +02:00
Vincent Lejeune
dbed303d90
Try to fix ci
2014-08-07 21:02:16 +02:00
Vincent Lejeune
95fb3ea580
Add support moving texture in rsm.
2014-08-07 20:44:33 +02:00
Vincent Lejeune
e932638aef
Port sunlight* shaders to singleton.
2014-08-07 20:07:03 +02:00
Vincent Lejeune
160d061e84
Port Tonemap shader to singleton
...
Should fix kart selection screen without UBO support.
2014-08-07 19:36:32 +02:00
Vincent Lejeune
4faa7cf2b7
Store current screen size
...
When UBO support is lacking.
2014-08-07 19:30:11 +02:00
Daniel Butum
c272d39d09
Merge remote-tracking branch 'upstream/master'
2014-08-07 13:33:21 +03:00
hiker
18cb4f6d12
Merge remote-tracking branch 'origin/master' into bumpy
2014-08-07 11:16:53 +10:00
Vincent Lejeune
8544ff10e9
Disable depth test in non dynamic light mode.
...
Just in case...
2014-08-07 02:47:07 +02:00
Vincent Lejeune
7c31275704
Forget the ...
2014-08-07 02:43:21 +02:00
Vincent Lejeune
506dca47eb
Better if we dont remove the real function call...
2014-08-07 02:42:23 +02:00
Vincent Lejeune
27d3d3bfb3
Add a static assert.
...
Check if we pass correct count of uniforms name to AssignUniforms().
2014-08-07 02:37:53 +02:00
Vincent Lejeune
926fc3ac7c
Use singletonshader template for colorize
2014-08-07 02:29:13 +02:00
hiker
20242dae5e
Merge remote-tracking branch 'origin/master' into bumpy
2014-08-07 10:13:07 +10:00
Vincent Lejeune
87bf242164
Fix shadows for unlit with alpha ref.
2014-08-07 02:12:13 +02:00
Vincent Lejeune
858b789419
Support vertex color for alpha ref material.
2014-08-07 02:11:55 +02:00
hiker
e68d09c2e4
Merge remote-tracking branch 'origin/master' into bumpy
2014-08-07 10:00:16 +10:00
Vincent Lejeune
8dcf9f6a21
Text billboard uses unlit material.
2014-08-07 01:51:10 +02:00
Vincent Lejeune
c0d57100a7
Enable ref + vertex color for unlit mat.
2014-08-07 01:50:53 +02:00
Marianne Gagnon
024f6f3fee
clean up billboard text code
2014-08-06 19:33:09 -04:00
Vincent Lejeune
986fd8050a
Fix ambient term.
2014-08-07 01:02:30 +02:00
Vincent Lejeune
79fba1779e
Port stkbillboard to singleton shader
2014-08-07 00:52:44 +02:00
Vincent Lejeune
a0e457ac13
Port shadow shaders to singleton and remove non singleton.
2014-08-07 00:40:09 +02:00
Sachith Hasaranga Seneviratne
8aa4e998f2
Minor change in script order
2014-08-06 10:31:06 +05:30
Sachith Hasaranga Seneviratne
f27ed7b144
Got barrel working
2014-08-06 10:07:45 +05:30
Marianne Gagnon
30c11ad6d4
tweak braking config value
2014-08-05 20:10:46 -04: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
Daniel Butum
28f7a45664
Do not show password_confirm field in the output when registering
2014-08-05 19:40:56 +03:00
Daniel Butum
c6c0c6e590
Rename some API calls
2014-08-05 19:12:56 +03:00
Sachith Hasaranga Seneviratne
ef17ad8072
Added comments to TrackObjectManager
2014-08-05 20:28:40 +05:30
Sachith Hasaranga Seneviratne
e7585906ea
Added enable method specific to Physical Objects to allow previously disabled track objects to be renabled
2014-08-05 20:20:26 +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
Sachith Hasaranga Seneviratne
e4e0b7ec2f
Changed example scripts to use the new function
2014-08-05 20:00:25 +05:30
Sachith Hasaranga Seneviratne
50faed49a9
Added global functions enable(string track_object_id) and disable(string track_object_id) for track objects
2014-08-05 19:53:11 +05:30
hiker
1ba6537e37
Merge remote-tracking branch 'origin/master' into bumpy
2014-08-05 08:26:05 +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
Daniel Butum
62e6a2d733
Merge remote-tracking branch 'upstream/master'
2014-08-05 00:19:49 +03:00
vlj
1abd3b7bac
Merge pull request #1439 from konstin/master
...
fix video options dialog
2014-08-04 21:33:11 +02:00
konstin
03b2379eef
fix video options dialog
2014-08-04 21:11:53 +02:00
Daniel Butum
c10ca31452
Use new API paths when calling the stk server
2014-08-04 21:55:56 +03:00
Sachith Hasaranga Seneviratne
127162190a
Temporarily disabled explosion creation for the sand-barrel example
2014-08-04 22:44:41 +05:30
Sachith Hasaranga Seneviratne
be0f09a828
Moved trigger creation to onstart script
2014-08-04 22:43:56 +05:30
Daniel Butum
b3f9f9f407
Refactor online namespace. Define api php file names from a single place
2014-08-04 18:41:47 +03:00
deve
5511f55dd9
Add fallback if irrlicht won't report any resolution.
2014-08-04 08:39:02 +02:00
hiker
7e65d4d346
Merge remote-tracking branch 'origin/master' into bumpy
2014-08-04 14:29:31 +10:00
hiker
c4928ceb7f
Modify suspension parameters and visual positioning of the kart to
...
test less bumpiness.
2014-08-04 13:54:43 +10:00
Marianne Gagnon
00e6e7bcc2
Fix billboard text scene nodes having wrong rotation when attached to a parent node (.e.g. a kart)
2014-08-03 20:17:11 -04:00
vlj
fb9dc7af74
Fix for travis-ci
2014-08-04 02:08:08 +02:00
Marianne Gagnon
072c118f95
Fix splatting, which had been broken by a recent commit of mine
2014-08-03 20:03:17 -04:00
Marianne Gagnon
346faff845
Clean up video settings dialog. Not a bad attempt vlj but not quite there ;)
2014-08-03 19:57:33 -04:00
vlj
c0e554de30
Remove UBO settings in the options
2014-08-04 01:50:04 +02:00
Marianne Gagnon
bb7d83a89a
Merge branch 'NewBillboardText'
2014-08-03 19:49:31 -04:00
vlj
2fcb574c90
Automate UBO fix detection.
...
It only concerns Intel Sandy Bridge (maybe Ivy Bridge ?) gpu on Windows.
2014-08-04 01:45:08 +02:00
Marianne Gagnon
fd1bde9eeb
New billboard text scene node is almost complete now
2014-08-03 19:30:59 -04:00
vlj
00b3049aad
Forget to delete 2nd order SH coefficient arrays.
2014-08-04 01:26:35 +02:00
vlj
7f44467f67
Manually delete an IImage *
...
Ref couting doesnt seem to work on this object.
2014-08-04 01:16:41 +02:00
vlj
6c71334cda
Only calculate diffuse coefficient once.
2014-08-04 01:12:45 +02:00
Marianne Gagnon
2ee9a29e11
Use new billboard text node in FTL
2014-08-03 18:19:38 -04:00
Marianne Gagnon
bfc4c43b3a
Improve billboard text node
2014-08-03 18:17:25 -04:00
Marianne Gagnon
99135a9a40
Merge branch 'master' into NewBillboardText
2014-08-03 17:59:08 -04:00
Deve
03c3f1dae7
Fixed typo
2014-08-03 22:05:55 +02:00
Deve
b08ff9dedf
Update .gitignore file.
...
Too many builds in one folder ;-)
2014-08-03 21:58:33 +02:00
Deve
15b316a9af
xrandr: update width and height params when wanted resolution was not found and we get the default one.
2014-08-03 21:56:16 +02:00
Deve
b15c902aee
Get dimensions of best resolution before creating irr device.
...
I also changed default 800x600 resolution to the size screen because sometimes this resolution may not exist. For example in rotated screens.
2014-08-03 21:50:59 +02:00
konstin
5fc44d25cd
correct invisibility settings
2014-08-03 13:56:53 +02:00
Marianne Gagnon
55e880530a
bugfix, only use the texture in layer 0 to apply material
2014-08-02 20:33:30 -04:00
Vincent Lejeune
a03a6809f7
Fix strange colors in rtts.
2014-08-02 22:30:48 +02:00
vlj
4b7918021e
Try to fix too dark tracks.
2014-08-02 21:43:14 +02:00
Sachith Hasaranga Seneviratne
66aa65e827
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-08-02 09:38:50 +05:30
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
30bd018738
Added sandbarrel to hacienda and tested explosion creation near the barrel
2014-08-02 08:39:22 +05:30
Marianne Gagnon
24ff6790f2
Add option to randomize particles start position, and use it on snow, so that snow falls more evenly
2014-08-01 21:17:56 -04:00
Marianne Gagnon
db0241c5e2
more video settings fixes
2014-08-01 20:56:04 -04:00
Marianne Gagnon
5f70471bce
Fix previous commit about shadows vs UBOs, had forgotten shadows is an int and not a bool
2014-08-01 20:39:25 -04:00
Marianne Gagnon
2a9d63b7ae
Disable shadows when UBOs are off
2014-08-01 20:21:44 -04:00
Marianne Gagnon
edecfbdb59
Ignore minor logging spammed by recent nvidia drivers
2014-08-01 19:19:10 -04:00
Vincent Lejeune
ca30bf7d5a
Add screen fallback in case no ubo are here.
2014-08-02 01:02:06 +02:00
Vincent Lejeune
09d0c2eef5
Forget a shader + remove shader output
2014-08-02 00:56:36 +02:00
Vincent Lejeune
58c094917e
Use an header included in every shaders.
2014-08-02 00:50:56 +02:00
Sachith Hasaranga Seneviratne
8c2f0f1e14
fixed some scripts not using Vec3 in trigger creation
2014-08-01 19:51:39 +05:30
Sachith Hasaranga Seneviratne
c3a774fcc9
Merged master
2014-08-01 18:40:05 +05:30
Deve
67948dfe28
xrandr: add support for rotated screens
2014-07-31 23:13:03 +02:00
konstin
a2d76dd098
Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp
2014-07-31 10:57:11 +02:00
hiker
a81f21a27a
Applied konstin's bugfix for an editor crash.
2014-07-31 09:28:42 +10:00
hiker
6749944dd8
Applied bugfix from konstin.
2014-07-31 09:19:52 +10:00
Flakebi
bc458c42d3
Apply per-player difficulty
2014-07-30 22:26:59 +02:00
konstin
691d1fb68c
Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp
2014-07-30 21:54:55 +02:00
Deve
b11fd2aaf6
xrandr: now it seems to work fine. I enable it for testing.
...
This should be useful for people which have two or more display devices. It changes resolution only on main screen and leaves other screens untouched.
Currently I use screen which is the most on left (or on top). Ideally we should be able to choose in settings which screen we want to use. But support it on all platforms is rather too much of work. We could also detect from which screen STK was executed. This can be done differently on different window managers, but nothing impossible. Maybe in future.
Perhaps we should add fallback using old xrandr method.
BTW. in some specific cases it works better than SDL2 ;-)
2014-07-30 21:30:43 +02:00
Deve
73b45e71c7
xrandr: fixed issue with fullscreen window which was placed in wrong screen in some window managers.
...
In some cases main screen may have other position than (0, 0) - fixed it.
2014-07-30 21:30:43 +02:00
konstin
e7d3ab4be2
fix compilation
2014-07-30 16:17:40 +02:00
konstin
98d3728a4e
finish the save gp button
2014-07-30 16:06:44 +02:00
konstin
fb50c9c338
moving the button to xml
2014-07-30 14:58:53 +02:00
konstin
5a43fecdd0
Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp
2014-07-30 13:59:41 +02:00
Vincent Lejeune
f9c7c3db5e
Try a fix for intel and kart selection screen.
2014-07-30 01:25:27 +02:00
Vincent Lejeune
f1c29ad26f
Port instancing shaders to singleton.
2014-07-30 00:34:00 +02:00
Vincent Lejeune
b935e9316a
Update doxygen comment.
2014-07-30 00:10:00 +02:00
Vincent Lejeune
a35c33e4f6
Remove ambient
...
It's already added in the diffuse env pass
2014-07-29 23:56:48 +02:00
Flakebi
a84094e55e
Add difficulty to karts
2014-07-29 22:54:42 +02:00
Flakebi
bcf7690809
Ignore vim swap files
2014-07-29 16:26:49 +02:00
Marianne Gagnon
db26ef3076
More work on billboard text
2014-07-28 19:49:14 -04:00
Marianne Gagnon
f803b01d10
Initial work on billboard text
2014-07-28 19:17:59 -04:00
Marianne Gagnon
3db9b867a6
In artist debug mode, fast-track race start even more, tired of waiting after thunderbird to test
2014-07-28 19:16:32 -04:00
Marianne Gagnon
c2cd32d4de
Fix c++2011 logic from previous commit. STK now builds again on my mac, finally!
2014-07-28 19:01:53 -04:00
Vincent Lejeune
ff5e457869
Fix include in wiimote_manager.hpp
2014-07-29 00:50:40 +02:00
Vincent Lejeune
fca54c8f74
Remove some other emplace_back.
2014-07-29 00:48:14 +02:00
Vincent Lejeune
f31013b4af
Fix include in stkbillboard
2014-07-29 00:40:37 +02:00
Vincent Lejeune
bd7babe11f
Rename cpp2011.h
2014-07-29 00:35:43 +02:00
Marianne Gagnon
6d100a23d8
Force billboard to render in transparent phase, won't work otherwise
2014-07-28 18:29:10 -04:00
Vincent Lejeune
13f22ab1cd
If there is a sphericalHarmonicsTexture, kill ambient.
2014-07-29 00:19:50 +02:00
Vincent Lejeune
b9e56303c1
Try to replace emplace_back() call.
...
Only on some part of the code, need confirmation it works before
propagating.
2014-07-28 23:41:01 +02:00
Deve
46f73e8ecc
Some improvements for xrandr
...
- choose best available refresh rate
- if resolution doesn't exist, choose first available
- other minor changes.
Works fine with Gnome, but I notices some issues on Openbox and Unity.
2014-07-28 19:23:03 +02:00
Flakebi
71f8766cb1
Add per-player difficulty
2014-07-28 18:32:39 +02:00
hiker
dbe722316a
If an addon icon can not be shown, delete the image file (which will
...
trigger a re-download on the next start).
2014-07-28 21:07:39 +10:00
hiker
f6fcb9d8da
Changed return type of getIconBasename() to be a reference.
2014-07-28 21:07:03 +10: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
Deve
992c97258f
Few more checks
2014-07-27 20:00:04 +02:00
Deve
0409a84fa0
Remove debug output
2014-07-27 19:36:40 +02:00
Deve
068b88cb4b
Rename some variables, free memory etc.
2014-07-27 19:32:12 +02:00
Deve
85dd8d11a9
Add experimental support for multi-monitor on linux using xrandr.
...
Now you can play STK on one screen and watch TV on the second ;-)
Currently I use first (main) screen. We can detect from which screen STK was executed using xinerama.
Will be improved.
2014-07-27 00:48:34 +02:00
Vincent Lejeune
f87b404561
Add some doxygen on shader creation/usage
2014-07-26 23:54:57 +02:00
konstin
7a2e4e6336
corrections
2014-07-26 12:00:24 +02:00
Deve
b9eb981fcc
Some cleanup with USE_XRANDR flag
2014-07-25 19:24:35 +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
konstin
58a8a4ff31
fix index
2014-07-25 13:02:47 +02:00
deve
f3746c068c
Some minor fixes for MinGW compiler
2014-07-25 13:00:01 +02:00
hiker
2f71c5f99f
Merge branch 'konstin-lapnumber'
2014-07-24 17:44:26 +10: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
konstin
eae71b3df9
remove C++11
2014-07-24 08:41:45 +02:00
Marianne Gagnon
9478adbd8c
Merge branch 'TupleTest'
2014-07-23 21:17:08 -04:00
hiker
12259c6c48
Try to fix travis building debug and release (cd failed before, causing
...
travis to fail).
2014-07-24 09:52:29 +10:00
hiker
2896b47233
Try to let yavis compile both debug and release mode.
2014-07-24 09:26:27 +10:00
Marianne Gagnon
7f56bf6946
Invalid defaut value for sortable was used in list widget
2014-07-23 18:43:12 -04:00
Deve
16d4f0481e
Merge pull request #1421 from Flakebi/master
...
Fix compiling issues without debug mode in my log code
2014-07-23 23:13:44 +02:00
Flakebi
bfd54cf37c
Split kart selection screen into more files
2014-07-23 22:08:22 +02:00
konstin
eb5e148aa7
resolve conflict
2014-07-23 21:52:53 +02:00
konstin
7978c25fc5
more improvements
2014-07-23 21:49:53 +02:00
Flakebi
277aab1a0e
Fix compiling issues without debug mode in my log code
2014-07-23 21:40:46 +02:00
konstin
b6d7834c85
removing unnecessary codes and compiler warnings
2014-07-23 21:25:31 +02:00
konstin
e4f7b6041c
use parent to remove copy+paste code
2014-07-23 16:43:25 +02:00
konstin
1d8b4c352d
deriving GPWIn
2014-07-23 15:33:09 +02:00
konstin
02d21053fc
begining with grand_prix_cutscene.cpp (first compiling prototype)
2014-07-23 15:28:57 +02:00
Flakebi
4fe34007cd
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-07-23 15:18:46 +02:00
Flakebi
0195d95bad
Adding basic gui for per-player difficulties
2014-07-23 15:18:40 +02:00
hiker
9fa93d74d5
Fixed linux compilation.
2014-07-23 22:11:37 +10:00
konstin
80e61e0ca0
Adding save Button for random GP
2014-07-23 10:01:29 +02:00
Marianne Gagnon
06e4cbb9be
Fix input config screen, since the list widget was improved it didn't display quite right
2014-07-22 20:09:38 -04:00
auriamg
daa84aabef
Merge pull request #1419 from Flakebi/master
...
Fixes and using the log for log output
2014-07-22 19:38:55 -04:00
Deve
35436346cd
Merge pull request #1420 from konstin/gitignore
...
make git ignore "data/models" and the track editor
2014-07-22 22:10:32 +02:00
konstin
3da38823a7
Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp
2014-07-22 21:16:00 +02:00
konstin
ba92e1ef6b
make git ignore data/models and the track editor
2014-07-22 17:45:35 +02:00
Flakebi
55090a0566
Unify log output
2014-07-22 12:54:11 +02:00
Flakebi
53fd34f7b8
Fix issues with in-game screens
2014-07-22 12:54:11 +02:00
Flakebi
a9a46a2dd6
Some little fixes
2014-07-22 12:54:10 +02:00
hiker
c322c507da
Fix shader error (vlj, please check).
2014-07-22 13:28:12 +10:00
Marianne Gagnon
fff498b9fe
Improve graphics settings dialog to try to avoid mutually incompatible options
2014-07-21 19:58:45 -04:00
Marianne Gagnon
b2fab2ae6d
Fix glitch where the irrlicht dialog close button would be slightly visible in the corner of a STK dialog, and a crash would ensue if you clicked it
2014-07-21 19:55:02 -04:00
Marianne Gagnon
939e5d9fff
Rework graphics settings popup to make it clear which options require the advanced pipeline
2014-07-21 19:48:17 -04:00
Marianne Gagnon
14080e602a
Code in previous commit was incorrect, no idea why it even compiled for me
2014-07-20 18:18:35 -04:00
Marianne Gagnon
476d6eda02
almost there
2014-07-20 18:10:48 -04:00
Marianne Gagnon
01ed87ec1b
continue
2014-07-18 20:30:35 -04:00
Marianne Gagnon
7e8fb6bc16
Fix duplicated paramter name
2014-07-18 20:11:40 -04:00
Marianne Gagnon
071270cb5e
more work
2014-07-18 20:02:10 -04:00
Marianne Gagnon
40851516ac
continuing work
2014-07-18 19:22:20 -04:00
Deve
bb4381a0a7
Merge pull request #1414 from konstin/fontsize
...
fix #1410 + better text alingment in GP info dialog
2014-07-18 21:02:35 +02:00
konstin
7a8743fb65
better text alingment in GP info dialog
2014-07-18 16:03:23 +02:00
konstin
0a93b7a2d3
fix #1410
2014-07-18 15:58:34 +02:00
Marianne Gagnon
6aa95f58b9
Merge branch 'master' into origin/TupleTest
2014-07-17 20:01:27 -04:00
Marianne Gagnon
00ae12677a
Fix GUI crashes when exiting STK by clicking the X button in the window titlebar
2014-07-17 19:24:35 -04:00
Flakebi
a77778b1cd
Display skill labels only once
2014-07-17 21:33:25 +02:00
konstin
e7a9c6fcc6
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lapnumber
2014-07-17 20:32:54 +02:00
vlj
4e079b0e14
Fixes shader errors reported by Auria
2014-07-17 02:17:49 +02:00
vlj
23bc1f9344
Remove use of texture2d in rh.frag
2014-07-17 02:11:04 +02:00
Marianne Gagnon
e6fd365685
Re-fix clang fixes so that it works on other compilers too
2014-07-16 20:02:52 -04:00
Marianne Gagnon
8483613a4e
clang fixes
2014-07-16 19:51:24 -04:00
vlj
c4238d2089
Use emplace_back instead of push_back(std::make_tuple())
2014-07-17 01:44:57 +02:00
vlj
14e3ccd059
Duplicate singleton code for abstract/non abstract cases
2014-07-17 01:30:45 +02:00
vlj
366439bdd0
Reenable transparents.
2014-07-17 01:07:59 +02:00
vlj
6e4cca81d1
Fix material identification.
2014-07-17 01:06:17 +02:00
vlj
25c5fb326f
Do not use srgb texture for splatting.
2014-07-17 00:56:11 +02:00
vlj
6710f61863
Do not convert normal map to srgb.
2014-07-17 00:46:17 +02:00
vlj
be55a1a1c6
Reenable normal map material.
2014-07-17 00:36:10 +02:00
Marianne Gagnon
44bce402e3
clang fixes
2014-07-16 18:34:59 -04:00
vlj
f5a5988967
Fix instanced and reenable displace.
2014-07-17 00:24:09 +02:00
vlj
40a7ab0780
Raise one of ssao tolerance value.
2014-07-17 00:12:54 +02:00
vlj
e6bade24ad
Fix RSM
2014-07-17 00:10:34 +02:00
vlj
55ab93a4e6
More work.
2014-07-16 23:44:16 +02:00
vlj
1d0fb9ca68
Simplify material
2014-07-16 23:15:07 +02:00
vlj
27020c0c92
Move draw template function to render_geometry.cpp
2014-07-16 21:38:38 +02:00
vlj
1aa43814b0
Partially unroll template for grass shadow.
2014-07-16 19:41:28 +02:00
konstin
b0f3a48d80
close #1397
2014-07-16 16:02:36 +02:00
konstin
ea56f66d83
Revert "unify separators"
...
This reverts commit ad641eff67 .
2014-07-16 15:46:52 +02:00
konstin
ec73fcb2b7
minor stuff
2014-07-16 15:40:27 +02:00
konstin
0ec2cd6dc1
Merge branch 'master' of https://github.com/supertuxkart/stk-code into asdf
2014-07-16 15:16:11 +02:00
hiker
ed349914fb
Fix linux compilation.
2014-07-16 21:24:32 +10:00
hiker
a39efe7b3f
Fixed incorrect fix for linux compilation done by me:
...
Shader::getInstance<Shader>()->Program
does not compile on some gnu compiler, proper way is:
Shader::template getInstance<Shader>()->Program
Thanks to auria!
2014-07-16 16:38:41 +10:00
hiker
d0784f3fcd
Fix #1407 (huge rank number in FTL HUD).
2014-07-16 16:28:32 +10:00
hiker
e79c637a11
Try to use an even newer repo, since the previous one is only supported till ... end of this week ;)
2014-07-16 10:18:07 +10:00
hiker
cfed9fc44e
Try to use saucy repo for the opengl updates. Fingers crossed.
2014-07-16 10:01:24 +10:00
Marianne Gagnon
797dcf845e
Test converting code to home-brew Tuple so that STK compiles again on my mac, where clang does not include tuple
2014-07-15 19:48:34 -04:00
hiker
c386f48689
Try to fix travis ci by using a different version (quantal is not on the
...
ubuntu servers anymore).
2014-07-16 09:47:06 +10:00
hiker
a03d1df8dc
Fix linux compilation.
2014-07-16 09:35:59 +10:00
hiker
ec1b0ab9fc
Merge branch 'konstin-m_random_gp'
2014-07-16 08:19:24 +10:00
vlj
b79cebba40
Use singleton template again.
2014-07-16 00:16:57 +02:00
hiker
a8b2ad4f0a
Merge remote-tracking branch 'origin/master' into konstin-m_random_gp
2014-07-16 08:12:16 +10:00
hiker
649848cac2
Mostly cosmetic changes (renamed variables, added comments). Changed
...
'random' constructor of GrandPrixData into a function so that there
is no need to create a new GPData objects and then copy it.
2014-07-16 08:11:09 +10:00
Sachith Hasaranga Seneviratne
16e6401fab
Merged master, resolved conflict in CMakeLists.txt
2014-07-15 22:28:20 +05:30
Sachith Hasaranga Seneviratne
cbebfcd428
Changed trigger creation method to use Vec3
2014-07-15 22:19:41 +05:30
Flakebi
776020cc12
Some little fixes
2014-07-15 17:57:37 +02:00
konstin
ad641eff67
unify separators
2014-07-15 17:15:42 +02:00
konstin
0df72779a9
Use default laps for track info dialog
2014-07-15 17:10:37 +02:00
konstin
a7c6eb3853
close #1263
2014-07-15 15:57:33 +02:00
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
hiker
3684d22ef8
Try to fix linux compilation.
2014-07-15 16:09:57 +10:00
Marianne Gagnon
a3dbb53540
Minor code tweaks for the new feature unlocked scene
2014-07-14 21:39:11 -04:00
hiker
f24e53538c
Merge branch 'master' into konstin-m_random_gp
...
Conflicts:
src/states_screens/dialogs/gp_info_dialog.cpp
2014-07-15 11:07:44 +10:00
hiker
55df48d3e6
PLEASE UPDATE stk-assets! Moved data/models to stk-assets to help with
...
editor development.
2014-07-15 10:52:57 +10:00
vlj
82b5097391
Turn pass1 shaders to singleton template.
2014-07-15 02:43:27 +02:00
vlj
5e0fb8dcf7
Use the singleton template
2014-07-15 02:15:12 +02:00
hiker
a9d3ef0b78
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-07-15 09:13:00 +10:00
hiker
ccb8d0e973
Fix crash: a reference to a string in a widget was used after the
...
widget was deleted.
2014-07-15 09:10:54 +10:00
vlj
c06879a8b4
Fix animated transparent texture.
2014-07-15 00:03:33 +02:00
vlj
9230cab9dd
Add shadow for instanced grass.
2014-07-15 00:02:17 +02:00
vlj
146e99b13d
Port instanced shadow shaders to singleton.
2014-07-14 23:49:00 +02:00
vlj
ffe77e4aa4
Port instanced pass2 shaders to singleton
2014-07-14 23:41:47 +02:00
vlj
098eb7f595
Port remaining pass 1 Instanced shaders to singleton
2014-07-14 23:25:52 +02:00
vlj
732aefc2dc
Turn instanced pass1 shader to singleton.
2014-07-14 23:14:20 +02:00
vlj
5838af5f3e
Remove useless function.
2014-07-14 23:13:33 +02:00
Vincent Lejeune
e310ad5628
Move skybox/lights code out of render.cpp
2014-07-14 19:44:11 +02:00
Vincent Lejeune
62bf54b8f3
Simplify displace handling
...
Should be faster now
2014-07-14 18:54:40 +02:00
Vincent Lejeune
d52d1c0409
oops
2014-07-14 18:52:41 +02:00
Vincent Lejeune
160d8c1634
Fix linux build
2014-07-14 18:51:01 +02:00
Vincent Lejeune
d035b86bc4
Turn displace shaders into singleton.
2014-07-14 18:42:19 +02:00
hiker
ab57903f9f
Try to convert m_gp from a GPData pointer to a GP object, compiles, but
...
crashes.
2014-07-14 23:08:46 +10:00
hiker
f24a000f78
Merge branch 'm_random_gp' of https://github.com/konstin/stk-code into konstin-m_random_gp
2014-07-14 14:54:59 +10:00
hiker
1350cc5985
Applied fix from b69a1d225a
...
to fix wiiuse compilation (esp. on travis-ci); enabled WIIUSE by default to test.
2014-07-14 14:21:02 +10:00
vlj
db4457655b
Fix for real torch in chocolate.
2014-07-14 03:00:46 +02:00
vlj
b186bc7f18
Try to fix chocolate torch displaced effect.
2014-07-14 02:25:04 +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
Marianne Gagnon
b456205b56
Another attempt at fixing kart selection screen, hopefully the right one
2014-07-13 19:48:13 -04:00
Marianne Gagnon
2be5c99d47
fix assertion failure on kart selection screen caused by manipulating variables directly instead of using the appropriate methods
2014-07-13 19:08:07 -04:00
vlj
d0f6e54bba
Add a isDisplacement bool
2014-07-14 00:35:23 +02:00
Marianne Gagnon
415a502ef1
As requested by vlj, move singleton from networking to utils
2014-07-13 18:03:26 -04:00
Vincent Lejeune
4e1fd9b4af
Move geometry rendering code to another file.
2014-07-13 21:49:25 +02:00
Vincent Lejeune
f2acac7230
Inadverly inverted shadow and shadow_grass.vert
2014-07-13 21:37:12 +02:00
Vincent Lejeune
54b1ce39e4
Add Grass shadows.
...
For non instancing object.
2014-07-13 21:33:44 +02:00
Vincent Lejeune
b2fc9eb682
Turn shadow shaders into singletons.
2014-07-13 21:08:49 +02:00
konstin
872413ba91
clean code
2014-07-13 19:45:10 +02:00
Vincent Lejeune
7b9fc60f9c
Factorise grass material
2014-07-13 18:56:17 +02:00
Vincent Lejeune
adba84969e
Remove unneeded templates
2014-07-13 17:58:51 +02:00
Vincent Lejeune
67ab653aa0
Wrap setUniformsHelper inside a struct
2014-07-13 17:58:39 +02:00
vlj
d5bc6819fe
Factorize splatting shader.
2014-07-13 11:33:44 +02:00
vlj
c71a2c131f
Factorize transparent shaders.
2014-07-13 11:25:31 +02:00
vlj
8ec57b7683
Factorize unlit shader.
2014-07-13 02:39:33 +02:00
vlj
fbcc430e0e
Fix linux build.
2014-07-13 02:33:17 +02:00
vlj
fd7427a1cf
Factorize detail and spheremap
2014-07-13 02:30:37 +02:00
vlj
12af5eee9a
Factorize some pass2 shaders init code
2014-07-13 02:18:20 +02:00
vlj
a249ee8835
Add userconfig param
2014-07-13 01:34:20 +02:00
vlj
cc24407f09
Try another (dirty) fix.
2014-07-13 01:30:00 +02:00
vlj
6d643d973c
try to fix shader.hpp.
2014-07-13 01:23:49 +02:00
vlj
ff2ebfe731
Try to fix linux compilation.
2014-07-13 01:13:09 +02:00
vlj
22be386247
Turn Pass 1 shader to singleton, and factorize the setUniforms.
2014-07-13 01:10:28 +02:00
vlj
ef1bca5424
Try to factorize shader using variadic templates.
2014-07-13 00:11:35 +02:00
Vincent Lejeune
55a5185796
Avoid drawing negative color with splatting material.
2014-07-12 21:25:11 +02:00
Vincent Lejeune
de5499401c
Factorize splatting material.
2014-07-12 21:15:43 +02:00
Vincent Lejeune
97971a11b9
Fix RSM
2014-07-12 21:06:34 +02:00
Vincent Lejeune
ff92825531
Fix shadows.
2014-07-12 20:58:00 +02:00
Vincent Lejeune
df2595f594
Some shader factorization
2014-07-12 20:31:54 +02:00
Vincent Lejeune
51a9a215b6
Use a default texture for rubber band
2014-07-12 20:24:28 +02:00
Vincent Lejeune
d7139920ed
Fix position reconstruction formula in ssao
2014-07-12 19:54:52 +02:00
Sachith Hasaranga Seneviratne
acd11ce738
Added sound trigger (one time and cyclic)
2014-07-12 09:13:47 +05:30
Sachith Hasaranga Seneviratne
44d502d1fe
Added stop() to script-bound sounds
2014-07-12 07:34:35 +05:30
Sachith Hasaranga Seneviratne
f61fd2b13a
Removed unnecessary script files
2014-07-12 07:34:15 +05:30
Marianne Gagnon
abe8275969
Merge branch 'renderFactorisation'
2014-07-11 20:51:12 -04:00
Marianne Gagnon
6f0e3c0c08
Remove useless RTT and simplify rendering of icons on the minimap
2014-07-11 20:50:42 -04:00
vlj
e62301c9f6
Merge branch 'renderFactorisation'
2014-07-12 01:20:19 +02:00
vlj
2e1da31278
Wrong condition used.
2014-07-12 01:19:12 +02:00
vlj
8612e49072
Early exit renderSkybox without skybox textures
2014-07-12 00:57:37 +02:00
Marianne Gagnon
9abdc84989
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-07-11 18:55:30 -04:00
Marianne Gagnon
45f9cc20d9
Add asserts to catch issue early
2014-07-11 18:54:35 -04:00
vlj
a17e4c47f9
Disable WIIUSE by default on linux.
2014-07-12 00:46:19 +02:00
vlj
ba38819fff
Enable CPP2011 on linux.
2014-07-12 00:38:03 +02:00
vlj
e44f68afa2
Factorize all first pass materials.
2014-07-12 00:21:30 +02:00
Vincent Lejeune
5acc53685c
Use const ref in recursive variadic template unroll_arg<>::exec
2014-07-11 20:39:20 +02:00
Vincent Lejeune
3a4cc63602
Factorize transparent materials too
2014-07-11 20:10:21 +02:00
Vincent Lejeune
ebc0d956d4
Fix linux compilation
2014-07-11 19:32:43 +02:00
Sachith Hasaranga Seneviratne
060eb35898
Added access to kart location to scripts
2014-07-11 11:27:11 +05:30
Sachith Hasaranga Seneviratne
f9e1f16c47
Set up polymorhic overriding for script-bound TrackObjectPresentation methods
2014-07-11 07:35:24 +05:30
Sachith Hasaranga Seneviratne
f4b357d03c
Merged master
2014-07-11 07:04:25 +05:30
Vincent Lejeune
04e9daeefd
Factorize detail mat too
2014-07-11 01:27:20 +02:00
Vincent Lejeune
f723a764fc
Factorize Unlit material
2014-07-11 00:39:20 +02:00
Vincent Lejeune
555b2c433c
Factorize spheremap too.
2014-07-10 22:32:12 +02:00
Vincent Lejeune
7f8331a5b5
Use variadic recursion to expand tuples
...
It's quite non trivial to do but it should save a lot of typing later.
2014-07-10 22:19:20 +02:00
vlj
c2f7c14fdb
Try to factorize using tuple
2014-07-10 18:49:17 +02:00
vlj
feda837de8
Factorize some rendering loops.
2014-07-10 18:11:35 +02:00
Sachith Hasaranga Seneviratne
07e4d35701
Added Vec3 to setVelocity function
2014-07-10 20:42:10 +05:30
Sachith Hasaranga Seneviratne
663869e729
Started unifying locations as Vec3 s
2014-07-10 16:38:15 +05:30
Marianne Gagnon
2d847cb6b9
Fix overworld minimap
2014-07-09 23:34:39 -04:00
Marianne Gagnon
297d8aaf86
Fix crash when disabling GLSL
2014-07-09 20:41:55 -04:00
auriamg
95c59b8d51
Merge pull request #1401 from konstin/master
...
running whitespace.py
2014-07-09 20:25:58 -04:00
vlj
87e07a83d5
Factorize and comment generateCubemapFromTextures
2014-07-10 01:29:38 +02:00
vlj
822c8725dd
Remove rimlight material
2014-07-10 01:02:52 +02:00
Vincent Lejeune
0e4b9040d6
Factorize a function and add proper doxy comment.
2014-07-10 00:38:13 +02:00
konstin
4633d82c23
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-07-09 21:19:17 +02:00
Sachith Hasaranga Seneviratne
a5914e436b
Changed all collision scripts to match new format
2014-07-09 23:52:05 +05:30
vlj
1324fa7b36
Readd support for 2tcoord vtx in rsm.
2014-07-09 18:06:24 +02:00
vlj
114b3f8830
Remove unused methods
2014-07-09 18:02:25 +02:00
vlj
7a989901e8
Fix ssao viz on nvidia.
2014-07-09 18:00:16 +02:00
vlj
481a5bd0d0
Fix bubble shader with glsl < 330.
2014-07-09 17:49:47 +02:00
vlj
5ee410c139
Use a default texture for transparent if not provided.
2014-07-09 17:47:09 +02:00
hiker
60ac76a3e8
Merge pull request #1398 from konstin/fix1
...
check if reverse is available; fix #1396
2014-07-09 14:17:56 +10:00
Marianne Gagnon
8c74ab5e14
Forgot to hide debug item
2014-07-08 22:07:49 -04:00
vlj
2c251ffaa4
Fix slip stream effect.
2014-07-09 03:59:21 +02:00
vlj
4c3db6ca59
Mix texture for displace.
2014-07-09 03:41:08 +02:00
vlj
25b5134881
Hack not to add displacement node to scene manager
2014-07-09 03:20:31 +02:00
vlj
9922047dd1
Do not ask GL vendor/renderer in no graphic mode.
2014-07-09 02:57:36 +02:00
Marianne Gagnon
faed904061
try to fix linux compilation
2014-07-08 20:39:31 -04:00
Marianne Gagnon
ed97fca7b3
Ease debugging GPWin/GPLose/FeatureUnlocked scenes
2014-07-08 20:37:39 -04:00
Marianne Gagnon
173ee0d510
Merge branch 'VAOGatherer'
2014-07-08 20:34:55 -04:00
Marianne Gagnon
dd7c2b6b61
Pass proper isRace value to post-processing
2014-07-09 02:30:41 +02:00
Vincent Lejeune
ac55a70c83
Mimic previous motion blur behavior
...
Depending on zypper + mask on center.
2014-07-09 02:29:49 +02:00
Marianne Gagnon
32fec1f559
Pass proper isRace value to post-processing
2014-07-08 20:25:12 -04:00
Vincent Lejeune
aec31b28dd
Merge remote-tracking branch 'origin/VAOGatherer'
2014-07-09 02:17:25 +02:00
Marianne Gagnon
7a0afd9321
Fix crash when changing kart from overworld
2014-07-08 20:10:54 -04:00
samuncle
1ecaea18b2
Add a fade out to avoid bokeh on distant objects (stars, moon, planet, background mountain)
2014-07-09 01:21:31 +02:00
Vincent Lejeune
6d7178aff5
Fix for missing texture with non advanced pipeline
2014-07-09 00:26:28 +02:00
konstin
ce7da4b237
running whitespace.py
2014-07-08 20:59:34 +02:00
konstin
eb0120fb77
fix #1395
2014-07-08 18:37:02 +02:00
konstin
240f0ec6b7
remove m_random_gp
2014-07-08 18:34:54 +02:00
vlj
6276cafba2
Use global VAO for rendering
2014-07-08 18:31:46 +02:00
Vincent Lejeune
afd97345f7
Add a global VAO manager
2014-07-08 18:31:45 +02:00
Vincent Lejeune
0a7e1312b5
Support for glDrawElements{Instanced}?BaseVertex
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
konstin
8cac64f39f
check if reverse is available; fix #1396
2014-07-08 16:47:56 +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
hiker
7ec2bae8e7
Minor style changes.
2014-07-08 14:41:59 +10:00
hiker
32707b8f88
Changed m_grand_prix of RaceManager to be an object (and not a pointer to
...
an object) anymore, which fixes a memory leak (and I also reverted my quick
fix from last night de7ceb0c2d to fix a crash,
which now not necessary anymore.
2014-07-08 13:20:53 +10:00
Vincent Lejeune
887438a0d0
Reduce blur amount
2014-07-08 02:37:00 +02:00
Marianne Gagnon
e229effba0
Fix gnu and sara on kart selection screen
2014-07-07 19:43:49 -04:00
Vincent Lejeune
d961a9a8bc
Fix vertex color for object_pass2
2014-07-08 01:35:04 +02:00
vlj
7bf6d4db8b
Change location where srgb fbo is disabled.
2014-07-08 00:24:21 +02:00
Vincent Lejeune
23bebff5c2
Forgot to add shaders.cpp to last commit
2014-07-07 19:33:01 +02:00
Vincent Lejeune
746e910e46
Remove some Motion Blur unused vars
2014-07-07 19:25:41 +02:00
Vincent Lejeune
f23f7b05e5
Turn motion blur into camera space motion blur
2014-07-07 18:44:25 +02:00
hiker
de7ceb0c2d
Quick fix to avoid crash at end of race, full fix to follow later ;)
2014-07-07 23:31:43 +10:00
Sachith Hasaranga Seneviratne
6b70ea36af
Bound sfx-emitters to scripts
2014-07-07 14:43:23 +05:30
hiker
09a9863a72
Merge branch 'konstin-a'
2014-07-07 17:01:48 +10:00
hiker
5611f1544d
Fixed VS compilation.
2014-07-07 16:54:25 +10:00
hiker
cab0b2d833
Fixed compiler warning.
2014-07-07 16:53:42 +10:00
hiker
c222bbcb1c
Merge branch 'a' of https://github.com/konstin/stk-code into konstin-a
2014-07-07 16:15:34 +10:00
hiker
0ff48588d0
Merge pull request #1387 from leyyin/master
...
Fix embarrassing clang compilation mistake (thanks to solistice and cand).
2014-07-07 16:02:29 +10:00
Sachith Hasaranga Seneviratne
d850b838ef
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-07-07 09:02:43 +05:30
Vincent Lejeune
d501125e9d
Remove some unused variables.
2014-07-06 21:06:27 +02: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
Daniel Butum
680cd3370a
Merge remote-tracking branch 'upstream/master'
2014-07-04 18:19:45 +03:00
vlj
b3489678e7
Prevent null SunCamViewMatrix from crashing stk.
2014-07-04 15:08:43 +02:00
Daniel Butum
361d4dfade
Optimize loop (thanks to cand)
2014-07-04 13:09:46 +03:00
Daniel Butum
27f2a18f37
Fix clang compilation (thanks to solstice)
2014-07-04 11:22:09 +03:00
Sachith Hasaranga Seneviratne
eb4f585b29
Added ability to trigger explosions (graphical only) via scripts, currently uses the cake explosion_bomb.xml
2014-07-04 12:04:28 +05:30
Sachith Hasaranga Seneviratne
097a6b6394
Hardcoded explosion working in hacienda now. TODO move into scripts for custom locations
2014-07-04 11:44:40 +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
b69c92198e
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-07-04 08:51:07 +10:00
hiker
235800a119
Merge branch 'properties'
2014-07-04 08:46:05 +10:00
hiker
26fd76b904
Fixed warnings and unnecessary divisions.
2014-07-04 08:45:12 +10:00
hiker
736c7264b9
Merge branch 'properties' of https://github.com/solistice/stk-code into properties
2014-07-04 08:34:48 +10:00
hiker
2228897f46
Merge pull request #1384 from leyyin/master
...
Fix move on unitialised values in displayFPS
2014-07-04 08:32:37 +10:00
Bart Cools
c274a3beef
Inserted fix for wrong use of parameters. The kart bars are now set correctly, but the use of "magical numbers" in the bars should be avoided somehow
2014-07-03 23:42:34 +02:00
Daniel Butum
e2418aea13
Fix c++11 feature
2014-07-04 00:34:37 +03:00
Daniel Butum
efac42f746
Fix move on unitialised values in displayFPS
2014-07-03 17:22:00 +03:00
Sachith Hasaranga Seneviratne
84fe9b09b7
Added move to meshes, created an example in greenvalley
2014-07-03 14:01:58 +05:30
hiker
80d09825bb
Fix (potential) problem with exponential spring response (which is
...
not used atm).
2014-07-03 16:53:12 +10:00
hiker
926f5fc641
Merge branch 'properties'
2014-07-03 15:25:08 +10:00
Sachith Hasaranga Seneviratne
8292b4bce7
Moved triggers in green-valley in preparation for implementing 'move' for track objects
2014-07-03 09:56:29 +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
hiker
be3882845c
Merge branch 'properties' of https://github.com/solistice/stk-code into properties.
...
Fixed conflict.
Conflicts:
src/guiengine/widgets/model_view_widget.cpp
2014-07-03 14:17:45 +10:00
Sachith Hasaranga Seneviratne
b47ad6df4d
Added script folders for all tracks
2014-07-03 08:15:25 +05:30
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
ad913bc961
Fix crash without advanced pipeline.
2014-07-02 22:37:52 +02:00
vlj
fd5061057d
Fix for instanced object with default material.
2014-07-02 22:37:51 +02:00
vlj
d5c91dcfe4
Remove Untextured material.
2014-07-02 22:37:51 +02:00
vlj
80cab0ed28
Use a default texture for default material when there is none
2014-07-02 22:37:50 +02:00
vlj
475d738d4b
Merge remote-tracking branch 'origin/NewRTTMinimap'
2014-07-02 00:24:03 +02:00
Bart Cools
d8f65cf3fa
moved test scripts to tools directory
2014-07-01 14:32:24 +02:00
Bart Cools
4a13eebc00
Merge branch 'master' into properties
2014-07-01 13:55:10 +02:00
Bart Cools
b1426dd31d
small changes to the tests to get some initial results
2014-07-01 13:33:35 +02:00
Bart Cools
41a5b5275b
properties group node is not really necessary
2014-07-01 13:32:26 +02:00
Bart Cools
0fa6df587f
Removed redundant kart configuration
2014-07-01 12:25:02 +02:00
Bart Cools
8862be1efc
Final fix for properties, every missing field / overwrite should now be handled
2014-07-01 10:59:42 +02:00
Bart Cools
1bbd294750
Forgot to add documentation to a single node
2014-07-01 10:43:00 +02:00
Bart Cools
a73462759b
Moved the default kart-type to <general-kart-defaults> to better catch missing values in the kart-type nodes. Also moved the documentation again to properly fit the fields.
2014-07-01 10:37:00 +02:00
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
vlj
61aaccca33
Clean vao_shadow_pass on instanced.
2014-06-29 22:30:18 +02:00
vlj
5cce35041b
Some cleanup
2014-06-29 22:28:50 +02:00
vlj
b861c3fb73
Use fixed attribute location for instanced objects.
2014-06-29 22:19:10 +02:00
vlj
bc7e2cd517
Some cleanups
2014-06-29 16:26:12 +02: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
vlj
14cfa57f2a
Change "faceness" of lap line.
2014-06-28 16:05:21 +02:00
Vincent Lejeune
8f59d8cac0
Add a weight for vignette.
2014-06-28 00:20:44 +02:00
Bart Cools
109f783fa4
Finally implemented the correct way to parse the data
2014-06-27 23:26:02 +02:00
Deve
45abf1c45a
Fixed compilation error
2014-06-27 21:19:36 +02:00
vlj
bde17a28d5
Fix for GL 3.1 context
2014-06-27 20:58:52 +02:00
hiker
9e44c5980a
Fixed --track command line option.
2014-06-27 15:39:33 +10:00
Marianne Gagnon
21cb22f13a
Workaround crash. Vlj, please look at this, this is probably not an idea fix!
2014-06-26 21:43:47 -04:00
Marianne Gagnon
394fb9be9b
Merge branch 'master' into NewRTTMinimap
2014-06-26 20:23:02 -04:00
Sachith Hasaranga Seneviratne
52fd23566a
Completed move of all tutorial messages to scripts
2014-06-26 20:47:37 +05:30
Bart Cools
000fa2cf73
Fixed skill bars to return correct values. Also minor fix in kart properties
2014-06-26 13:43:53 +02:00
Bart Cools
c3e862f40c
fix for different kart properties, now based on kart type set in kart.xml
2014-06-26 12:53:17 +02:00
Bart Cools
0fa746c805
Changes to stk_config to make 3 groups of karts, which will default to the medium, and can be set in the kart.xml
2014-06-26 12:09:22 +02:00
hiker
5eb447d3e6
Adjust graphical offset by rotation to fix graphical position not exactly
...
the same as physicsl position when kart drives on wall.
2014-06-26 16:55:33 +10:00
hiker
76cf9ed141
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-26 16:52:15 +10:00
hiker
e3939fdc7c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-26 16:22:19 +10:00
vlj
79838bffe3
Add 50% transparency to minimap.
2014-06-26 00:46:55 +02:00
Deve
d0091d9977
Fixed accidentaly noticed typo in comment
2014-06-25 22:22:54 +02:00
Deve
a56d6405dc
Simplify code for checking best refresh rate on linux, which I added previously.
2014-06-25 22:22:54 +02:00
Sachith Hasaranga Seneviratne
3437977806
Added Player Action Enums to scripts
2014-06-25 20:32:59 +05:30
Sachith Hasaranga Seneviratne
21c1f43ba3
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-25 19:48:13 +05:30
vlj
9bc2203adf
Remove break at wrong position
2014-06-25 01:43:51 +02:00
hiker
6905812425
Fixed typo in warning message.
2014-06-25 09:31:10 +10:00
vlj
a93b96d0b1
Use UBO matrixes in displace.
2014-06-25 01:22:03 +02:00
vlj
45e5fba979
Simplify vao management for non instanced nodes.
2014-06-25 01:13:23 +02:00
vlj
8e6fba3185
Some fixes
2014-06-24 23:57:29 +02:00
vlj
948c5e8aa2
Use explicit attribute location.
...
Should help implementing basevertex later, and simplify vao creation a
lot.
2014-06-24 23:17:41 +02:00
vlj
edc38c9933
Use object_pass.vert for transparent objects.
2014-06-24 22:20:01 +02:00
vlj
69e342490e
Fix ssao blur without compute.
2014-06-24 19:13:18 +02:00
konstin
a8343b2885
Merge branch 'master' of https://github.com/supertuxkart/stk-code into a
2014-06-24 16:42:18 +02:00
Sachith Hasaranga Seneviratne
a7416d1231
Added PlayerAction Enums as PA::ENUMNAME corresponding to the similiar value defined as PA_ENUMNAME under player actions
2014-06-24 19:30:20 +05:30
Sachith Hasaranga Seneviratne
07d5527ee0
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-24 18:16:55 +05:30
Sachith Hasaranga Seneviratne
df7b46a439
Key bindings now available via scripts
2014-06-24 18:12:42 +05:30
Sachith Hasaranga Seneviratne
a219585a41
Started adding configuration key bindings to scripting to move all tutorial messages to scripting
2014-06-24 08:45:27 +05:30
Marianne Gagnon
9ed57bdd46
Set ambient light when rendering minimap
2014-06-23 20:09:54 -04:00
Marianne Gagnon
1be98dc5db
Support animated textures in non-static objects too
2014-06-23 20:02:31 -04:00
Marianne Gagnon
4c3cce42ee
new minimap RTT fixes, getting there!
2014-06-23 19:45:48 -04:00
Marianne Gagnon
e9acaa8e4d
Do not hardcode minimap size
2014-06-23 19:34:29 -04:00
konstin
01623da5e9
remove +1
2014-06-23 16:13:54 +02:00
Vincent Lejeune
4d6aa9d942
Override clear color inside makeMiniMap
...
Track clear color was used, resulting in wrong alpha channel value.
2014-06-23 14:54:16 +02:00
Vincent Lejeune
1a8b35c796
Set blendfunc when calling draw2DImageFromRTT.
2014-06-23 14:46:02 +02:00
Arthur-D
d4bbb50e0a
Fixed accidental and embarrassing error.
2014-06-23 13:28:06 +02:00
Arthur-D
31d8234776
Added friend message icon.
2014-06-23 13:11:42 +02:00
hiker
01a3a446bb
Adjust the text width computation to take the left/right border of
...
the achievement background into account.
2014-06-23 17:24:07 +10:00
hiker
299816ac6f
Fixed sort order of achievements- and friend-messages.
2014-06-23 16:40:30 +10:00
hiker
3e77f4be0a
Fix windows compiler warnings.
2014-06-23 16:17:38 +10:00
Arthur-D
1a590e0fe1
Added new achievement background
2014-06-23 05:38:56 +02:00
Marianne Gagnon
d5e1bb6631
Make progress on new minimap RTT : it was actually 2 issues. First the new code calls camera->setAspectRatio which resets the matrix; second, we rendered the minimap from the back, and backface culling is now active
2014-06-22 21:28:25 -04:00
Marianne Gagnon
ca2ee5d226
New minimap rtt branch : now something is visible
2014-06-22 20:06:58 -04:00
hiker
6ed86fe09c
Fixed linux compilation.
2014-06-23 09:28:01 +10:00
hiker
6231e618d8
Added new message system to show achievements in race (and not as a
...
dialog later). Work in progress ... it doesn't look particulary nice yet ;)
2014-06-23 09:13:44 +10:00
hiker
8004e9d42c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-23 09:05:22 +10:00
vlj
d2fc258124
Tweak ssao (again)
...
Random factor is less perdicable, no more spiral.
2014-06-23 01:03:55 +02:00
vlj
be26ac7213
Fix crash with intel
2014-06-23 00:24:02 +02:00
hiker
afdfa15134
Merge remote-tracking branch 'origin/master'
2014-06-23 08:17:34 +10:00
vlj
a461a1f807
Remove tick for GI.
2014-06-23 00:12:39 +02:00
vlj
aaee62ca82
Reverse delete order of fbo.
...
Should be safer.
2014-06-22 18:08:26 +02:00
vlj
f76cd6e7a9
Implement bilateral with fragment codepath.
2014-06-22 18:04:46 +02:00
vlj
8f5dd6edae
Some tweak to ssao.
2014-06-22 18:04:46 +02:00
Vincent Lejeune
3219e564d0
Implemented bilateral for compute path.
2014-06-22 18:04:45 +02:00
vlj
d8edf64caf
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-06-22 02:32:43 +02:00
vlj
c377bdff58
Merge branch 'master' into NewRTTMinimap
2014-06-22 02:24:26 +02:00
vlj
7e8486d670
Merge remote-tracking branch 'origin/shadowdebug'
2014-06-22 02:21:15 +02:00
vlj
a7dbdc7a54
Use EAC_OFF
2014-06-22 02:17:50 +02:00
vlj
83cfe79404
Fix disappearing shadows
2014-06-22 02:12:17 +02:00
Marianne Gagnon
484f4b7e00
Merge branch 'master' into NewRTTMinimap
2014-06-21 18:56:11 -04:00
konstin
b13e6b9a96
Merge branch 'master' of https://github.com/supertuxkart/stk-code into a
2014-06-21 23:40:49 +02:00
Vincent Lejeune
6e85ac4eab
Fix GI matrix generation.
2014-06-21 19:54:12 +02:00
Vincent Lejeune
88a5d08e91
Report opengl vendor and renderer.
2014-06-21 19:29:35 +02:00
Vincent Lejeune
1e959a0e10
Tigher fit of shadow map.
2014-06-21 18:09:22 +02:00
konstin
98f8ddb4e9
fix path to icon
2014-06-21 17:18:01 +02:00
konstin
59a14df340
fix track group spinner
2014-06-21 17:16:23 +02:00
konstin
f4ce845b6f
Merge branch 'master' of https://github.com/supertuxkart/stk-code into a
2014-06-21 16:20:53 +02:00
konstin
7e9361bc8b
avoid reading deallocated memory
2014-06-21 16:19:37 +02:00
hiker
49fad934cd
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-21 09:35:45 +10:00
Vincent Lejeune
71969acd22
Use a precomputed invmatrix in gi.frag
...
(General) matrix inversion is costly, it's better if it's done a single
time on cpu. Improve performance.
2014-06-20 23:10:31 +02:00
Vincent Lejeune
cb161a2774
Remove code never executed.
2014-06-20 22:56:56 +02:00
Vincent Lejeune
4c9d1888f8
Factorize transparent mesh rendering.
2014-06-20 22:52:19 +02:00
Sachith Hasaranga Seneviratne
588ec991a8
Moved all simple messages into scripts
2014-06-20 12:24:52 +05:30
Sachith Hasaranga Seneviratne
388e9cb208
Started moving tutorial hard coded messages ito scripts
2014-06-20 11:36:10 +05:30
Sachith Hasaranga Seneviratne
b32b9ffe85
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-20 11:28:34 +05:30
hiker
78864c5df0
Removed unused variables.
2014-06-20 15:44:59 +10:00
hiker
eaded3bf46
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-20 11:04:15 +10:00
hiker
82d8cbf875
Fixed display or kart name in top left corner (caused by calling
...
add on the label widget twice).
2014-06-20 11:00:43 +10:00
auriamg
17511d7d32
Merge pull request #1371 from Flakebi/master
...
Change xml style of screens and fix some issues with screens
2014-06-19 20:03:18 -04:00
Sachith Hasaranga Seneviratne
94e6138298
Added current tutorial scripts to new structure
2014-06-19 19:09:51 +05:30
Sachith Hasaranga Seneviratne
f86b5f91af
Trigger scripts now work by binding to the FUNCTION pointed by the trigger action instead of by the FILENAME. Started adding files into a structure similiar to that present in the tracks/ directory
2014-06-19 19:02:00 +05:30
Bart Cools
a9de201874
apply new patches to before the dubious applied/reverted merge
2014-06-19 15:01:34 +02:00
Bart Cools
07b6579529
Fixed the GUI properties for multiplayer view, though the screen is way too full right now. Some changes (to GUI or screen) have to be done!
2014-06-19 15:01:34 +02:00
Bart Cools
cdb0e88895
Make creation of new skills more generic
2014-06-19 15:01:11 +02:00
Bart Cools
084a4a46f3
GUI Property now more modifiable (with SkillLevelWidget in vector and types in an enum)
2014-06-19 15:01:11 +02:00
hiker
45ac7d5e03
Fixed compiler warnings.
2014-06-19 15:01:11 +02:00
Bart Cools
43971c1e79
Fix for the changing ProgressBar.. The only thing now needed for properties GUI is making it fancy, and change the way it's placed with multiple players
2014-06-19 15:01:11 +02:00
Bart Cools
9b89868320
reflect changes in network kart selection
2014-06-19 15:01:11 +02:00
Bart Cools
e2abf6648f
ProgressBar shows, made 3 SkillLevelWidgets, only updating the widgets when hovering over new kart isn't working yet
2014-06-19 15:01:11 +02:00
Bart Cools
e7852648fa
Changes to the Skill Level Widget, only bar refuses to show
2014-06-19 15:01:11 +02:00
Bart Cools
d5d2ef991a
Fix for sometimes disappearing skill bar
2014-06-19 14:58:11 +02:00
Bart Cools
7ac7955808
First work on GUI support for different properties
2014-06-19 14:58:11 +02:00
Bart Cools
e47f85a32c
bit of testing with the scripts for optimal settings
2014-06-19 14:42:46 +02:00
Bart Cools
95bb6835ae
first work at adding kart properties widget to the kart selection screen
2014-06-19 14:42:46 +02:00
Bart Cools
a3c751728b
addition of python script to parse test output
2014-06-19 14:42:46 +02:00
Bart Cools
26967a41db
changes to progress bar to make the percentage label optional
2014-06-19 14:42:46 +02:00
Bart Cools
b94fe0fcde
Profile data now saved without escape characters
2014-06-19 14:42:46 +02:00
Bart Cools
79727500c0
Script to run batch profile tests
2014-06-19 14:42:46 +02:00
Flakebi
e16a7de617
Change xml style of screens and fix some issues with screens
2014-06-19 09:49:36 +02:00
Vincent Lejeune
76b76c6872
Try to fix crash on linux with proprietary drivers
2014-06-18 20:50:30 +02:00
Sachith Hasaranga Seneviratne
97c17692e8
Added setCurrentFrame to skeletal animations
2014-06-18 17:53:18 +05:30
Sachith Hasaranga Seneviratne
2db62da4ce
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-18 13:13:16 +05:30
Sachith Hasaranga Seneviratne
069c25653c
Added ability for scripts to run other scripts and bound getFrameNumber for Skeletal animations to get current frame
2014-06-18 13:12:51 +05:30
Marianne Gagnon
cd9c2653b6
Initial work on porting minimap to new RTT
2014-06-17 19:26:12 -04:00
Vincent Lejeune
32e6942b55
Merge branch 'master' into shadowdebug
2014-06-18 01:02:51 +02:00
Vincent Lejeune
bd6c8c4839
Fix shadowdebug not using right viewfrustrum
2014-06-18 00:43:41 +02:00
Vincent Lejeune
6bc9446b91
Fix build
2014-06-18 00:27:39 +02:00
Vincent Lejeune
e2ef26e667
Add wireframe frustrum view.
2014-06-18 00:27:03 +02:00
Marianne Gagnon
b9c45b7e0f
Undo dubious code that causes crashes
2014-06-17 18:14:24 -04:00
Marianne Gagnon
6a4e46af5c
Fix more issues on feature unlocked screen
2014-06-17 18:13:40 -04:00
Vincent Lejeune
bc83bb1339
Fix attempt for OS X
2014-06-17 22:24:02 +02:00
Sachith Hasaranga Seneviratne
b7e3329d83
Added setLoop to skeletal animations, Test : rapidly nodding sheep in green valley, also incorporates trigger creation at start in the test.
2014-06-17 21:11:05 +05:30
Sachith Hasaranga Seneviratne
77ee20a5e2
Added script triggering at startup via start.as - meant to customize track object settings, and to create triggers / set their initial states as necessary
2014-06-17 18:50:55 +05:30
Sachith Hasaranga Seneviratne
a6e2884456
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-17 17:49:10 +05:30
Sachith Hasaranga Seneviratne
ee73767572
Added possibility of triggering scripts via update method (ie everytime tracks etc are updated, this script will be called
2014-06-17 17:48:47 +05:30
Marianne Gagnon
a31ed23bc0
Fix compilation. Hopefully I broke nothing
2014-06-16 19:12:48 -04:00
Sachith Hasaranga Seneviratne
351643c851
Merged master into ScriptEngine by resolving conflict in sources.cmake
2014-06-16 20:56:46 +05:30
Sachith Hasaranga Seneviratne
f55d1c004e
Added better example to haybail example to showcase pausing and unpausing
2014-06-16 20:51:58 +05:30
Sachith Hasaranga Seneviratne
f0622f425d
Added pausing capabilities to curve based (IPO) animations, bound ThreeDanimation class to scripts as type Animator
2014-06-16 20:42:48 +05:30
hiker
6dd4c6f803
Use the new stkaddons feeature to allow more than one achievements to
...
be sent at a time. This means only one server request when local
achievements are synched to the online account.
2014-06-16 23:22:27 +10:00
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
hiker
a50177c96a
Removed messages.?pp files (and used the strings directly where they
...
are needed).
2014-06-16 22:05:50 +10:00
samuncle
6175d9f5bb
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-06-16 02:46:32 +02:00
samuncle
f8f0a46ed4
Now if a not instancied object use the grass vert it will use grass frag too
2014-06-16 02:45:39 +02:00
hiker
9cc34fd76b
Changed order of libraries to hopefully make font_tool compile for Arthur.
2014-06-16 09:39:37 +10:00
hiker
f1c8fcc6d4
Fix 1366.
2014-06-15 22:14:50 +10:00
hiker
e1a750672f
Fix #1364 .
2014-06-15 22:01:52 +10:00
Sachith Hasaranga Seneviratne
0c24507821
Added Test for getMesh
2014-06-14 14:45:17 +05:30
Sachith Hasaranga Seneviratne
4c3b8f435b
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-14 14:11:43 +05:30
Sachith Hasaranga Seneviratne
f29ed1c2a3
Bound Meshes to Scripts
2014-06-14 14:11:19 +05:30
samuncle
08369d1fcb
Added a new particle system for the torches and bring back the vignette
2014-06-14 00:42:57 +02:00
hiker
6425befc5e
Synchronise achievements from a local account to an online account.
2014-06-13 23:27:52 +10:00
vlj
4daa239c5c
Fix light with ssao disabled.
2014-06-13 13:45:37 +02:00
vlj
1a9f0a83b4
Add bypassUBO for ColoredLine
2014-06-13 13:41:07 +02:00
vlj
698d892f73
Fix for OSX compilation
...
OSX supports GL up to 4.0 and is unlikely to ship gl header for later
version.
2014-06-13 13:39:23 +02:00
Sachith Hasaranga Seneviratne
7d63813afd
Added wrapper for PhysicalObject->removeBody and bound it to scripts
2014-06-13 08:30:11 +05:30
Sachith Hasaranga Seneviratne
390642cb5f
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-13 08:00:56 +05:30
hiker
364c7434f6
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-13 09:09:36 +10:00
hiker
d36ff8b6db
Call reset function of RaceGUIBase, which fixes #1363 (missing thunderbird).
2014-06-13 09:07:52 +10:00
Marianne Gagnon
e3a2246e25
More work on cutscene screens
2014-06-12 18:43:20 -04:00
Marianne Gagnon
bc2209284b
Some fixes with menu-cutscenes
2014-06-12 18:25:54 -04:00
Marianne Gagnon
4ea1b7c6b1
Merge branch 'focus'
2014-06-12 18:01:41 -04:00
hiker
ed978cc6e7
Merge branch 'Flakebi-master'
2014-06-12 22:27:28 +10:00
hiker
8228a5bc15
Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master
2014-06-12 22:09:49 +10:00
hiker
025d7fa114
Tweaked position of font somewhat. Fixed missing rank display
...
when kart is standing still.
2014-06-12 22:00:00 +10:00
hiker
d72decfa65
Fixed using the last used track when specifying -N.
2014-06-12 16:54:09 +10:00
hiker
e33fc3c1d6
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-12 16:00:45 +10:00
hiker
cfe93f96f2
Speed up the rank animation, and don't make the old value completely
...
disappear (which makes the animation even faster).
2014-06-12 15:58:40 +10:00
Marianne Gagnon
540df39128
fix crash when using track debug. unfortunately, visual aids are not yet functional
2014-06-11 20:50:53 -04:00
Marianne Gagnon
e5532c32ff
Improve code to switch between GUI-cutscenes. Still not fully functional, but better
2014-06-11 19:37:04 -04:00
hiker
859dc3fbbd
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-12 09:34:22 +10:00
hiker
60f707b55d
Fixed gcc compiler warning.
2014-06-12 09:33:52 +10:00
hiker
1dc63849c9
Use a sigmar as big digit font and display time and
...
lap using this font (temporarily till we agree on a font).
2014-06-12 09:27:45 +10:00
hiker
9ae8446fae
Added -c CHARLIST option which will only export the characters
...
specified in the character list. Fixed auto-selection of export
used characters only.
2014-06-12 08:11:51 +10:00
Sachith Hasaranga Seneviratne
14d64e9fae
Bound function to check if a physical object is a flattener for testing
2014-06-11 12:30:48 +05:30
Sachith Hasaranga Seneviratne
f3a41a2631
Bound Physical Object class to scripts
2014-06-11 11:58:57 +05:30
Sachith Hasaranga Seneviratne
41a4619120
added bound setEnable method to TrackObject in scripts
2014-06-11 11:24:54 +05:30
Sachith Hasaranga Seneviratne
e567adb0ca
Bound TrackObject type to scripts
2014-06-11 10:52:04 +05:30
Sachith Hasaranga Seneviratne
113c87dccf
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-11 10:51:23 +05:30
Marianne Gagnon
ffe657b1c2
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-06-10 19:59:37 -04:00
Marianne Gagnon
8a4b4ae213
Update cutscene shortcuts
2014-06-10 19:59:30 -04:00
hiker
97a23e83cb
Merge branch 'big_digit'
2014-06-11 09:22:57 +10:00
hiker
28737270d9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-11 09:19:41 +10:00
hiker
89d8a19dab
Fixed shader compilation errors.
2014-06-11 09:11:07 +10:00
Marianne Gagnon
d6c983cac3
Add support to load new style glossmap (more work remains to do before this is complete)
2014-06-10 18:59:36 -04:00
hiker
a5c7b295be
Don't add the index offset for Asian fonts if no pot files are given.
2014-06-11 08:18:35 +10:00
hiker
e55d976aa2
Added simple animation when the player rank changes.
2014-06-10 16:58:43 +10:00
hiker
77400211ca
Added some tests to avoid NAN values (which I have seen once).
2014-06-10 09:19:02 +10:00
hiker
02b0cfd069
Use big digit font to display the kart rank inside of the speedometer.
2014-06-09 22:38:19 +10:00
vlj
753e22600d
Reverse shadowmap views.
2014-06-08 22:22:58 +02:00
vlj
8cbeca44fd
Add a way to display shadow map.
2014-06-08 22:18:32 +02: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
vlj
e959d6c857
MLAA: Use srgb for auxiliary buffer.
2014-06-08 03:28:24 +02:00
vlj
9bc89e0f40
Lower MLAA threshold.
2014-06-08 03:06:20 +02:00
vlj
877bf938bd
Fix different color with/without mlaa.
2014-06-08 02:50:02 +02:00
vlj
f4ca8f1f39
Fix low brightness without mlaa.
2014-06-08 02:32:56 +02:00
vlj
59ad95b93f
Fix ribbon not using ambient.
2014-06-08 02:26:40 +02:00
Marianne Gagnon
61d6caa521
Work on feature unlocked scene
2014-06-07 19:51:34 -04:00
vlj
31c773079e
Add a performance counter for MLAA
2014-06-08 00:25:34 +02:00
vlj
94900fe2c8
Add a performance counter for GUI
2014-06-08 00:20:44 +02:00
Sachith Hasaranga Seneviratne
5498084cde
Bound Vec3 class to scripts
2014-06-07 08:07:18 +05:30
vlj
ed98c4c8ff
Fix linux with 4.3+ context.
2014-06-07 02:16:00 +02:00
vlj
b27b68f768
Fix attempt for linux
...
Actually remove the code block if not on windows.
2014-06-07 02:04:15 +02:00
vlj
559d4f3b9f
Remove GI param test when reseting Ambient.
2014-06-07 01:49:23 +02:00
vlj
56896bab23
Minify ssao buffer.
2014-06-06 22:36:43 +02:00
Flakebi
9a37cd2c2b
Change focus cycle so invisible and deactivated widgets are skiped
2014-06-06 22:23:52 +02:00
hiker
508431b030
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-06 21:56:23 +10:00
hiker
d0879cf075
Removed file that should never have been added in the first place ;)
2014-06-06 21:53:57 +10:00
Flakebi
de4e45280b
Remember password better
2014-06-06 11:31:52 +02:00
Flakebi
03255a4156
Merge upstream/master into Flakebi/master
2014-06-06 10:06:25 +02:00
Lauri Kasanen
52b4651b9e
Fix typo in 76d564f
2014-06-06 11:04:50 +03:00
hiker
b0417758d5
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-06 10:59:09 +10:00
hiker
76d564f61f
Try to fix compilation with pre opengl 4 drivers.
2014-06-06 10:58:32 +10:00
Marianne Gagnon
be5577045d
Work on new feature unlocked cutscene, starting to work correctly, more testing (and art work) needed
2014-06-05 20:06:27 -04:00
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
hiker
d5d7f5bd92
Fixed logout of old player when switching to a new player. Fixed
...
disabling the account name (to prevent people from changing their
online name).
2014-06-06 08:05:25 +10:00
Flakebi
cd8c27cbec
Save 'remember-password' setting per user
2014-06-05 22:07:00 +02:00
konstin
3679bf4617
adding a comment; fix #930
2014-06-05 18:59:16 +02:00
Flakebi
db4699781a
Fix my fix
2014-06-05 18:47:15 +02:00
Flakebi
e490874a90
Fix compiler warnings
2014-06-05 18:27:19 +02:00
konstin
acc32703ed
Merge branch 'master' of https://github.com/supertuxkart/stk-code into a
2014-06-05 18:26:28 +02:00
konstin
173725a9d4
add a restart button + better looking on 600x800
2014-06-05 18:26:11 +02:00
Flakebi
bf76fbff6e
Fix bug with deactivated widgets where visibility is changed
2014-06-05 16:16:08 +02:00
hiker
b61e8e24db
Disable online flag in register screen if user did not enable
...
internet in the dialog. Removed unused function.
2014-06-05 21:28:30 +10:00
Sachith Hasaranga Seneviratne
85f6a7b576
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-05 12:39:07 +05:30
Sachith Hasaranga Seneviratne
795a6022e5
Revert "Revert "Merge sources.cmake change""
...
This reverts commit 0290564310 .
2014-06-05 12:38:38 +05:30
hiker
48b9016384
Fixed compiler warnings.
2014-06-05 17:07:54 +10:00
hiker
c2a3b3870d
Fixed crash on windows (caused by a variable beeing a large negative
...
value).Vlj, can you please have a look!
2014-06-05 17:02:53 +10:00
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
vlj
588ec08bc1
Merge branch 'CS'
2014-06-05 03:33:02 +02:00
Vincent Lejeune
03b66f4f59
Use immutable storage for depth/shadows/RSM
2014-06-05 03:19:19 +02:00
Vincent Lejeune
5b400b7ccb
Add some new gpu timers.
2014-06-05 03:19:19 +02:00
vlj
eb45954684
Implement Gaussian blur using Compute Shader
...
The filters are ~3.5 time faster with CS.
2014-06-05 03:19:18 +02:00
vlj
8cc1df3dd1
Update glext.h
2014-06-05 03:19:17 +02:00
Vincent Lejeune
cead5081be
Fix MLAA
2014-06-05 02:56:25 +02:00
Marianne Gagnon
02c68d5b02
Merge branch 'NewRTTWidget'
2014-06-04 20:46:24 -04:00
Marianne Gagnon
2b0f28669e
Merge branch 'NewRTTWidget' of https://github.com/supertuxkart/stk-code into NewRTTWidget
2014-06-04 20:29:40 -04:00
Marianne Gagnon
9af15c7bdf
Fix sky not cleared when exiting race, would show up on kart selection screen
2014-06-04 20:29:37 -04:00
Vincent Lejeune
87da1f9186
Fix attempt for black ribbon without gi.
2014-06-05 02:26:33 +02:00
Vincent Lejeune
bed088bd51
Fix proposal for dark stk track with gi enabled.
2014-06-05 02:18:53 +02:00
hiker
46ca3a2679
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-05 10:14:19 +10:00
hiker
b417a5c612
Fix deactivating entry field.
2014-06-05 10:12:26 +10:00
hiker
67c6e1b61e
Merge branch 'Flakebi-master'
2014-06-05 09:52:43 +10:00
Vincent Lejeune
f995c31372
Add sun to rtt
2014-06-05 01:44:15 +02:00
Vincent Lejeune
219bfbca93
Fix crashes and add a hunk I forgot
2014-06-05 01:34:12 +02:00
Vincent Lejeune
5f1413e140
Merge branch 'master' into NewRTTWidget
2014-06-05 01:30:45 +02:00
Vincent Lejeune
3f619e8e21
Fix ambient if no shadow are present.
2014-06-05 01:08:31 +02:00
hiker
5619509ebb
Prevent NANs/crash.
2014-06-05 08:59:24 +10:00
hiker
e3513b10c6
Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master
2014-06-05 08:23:47 +10:00
hiker
781820abef
Fix the online name (to force people to use only one online name).
...
This prevents people from passing achievements from one online
account to another (once two way synching is in place).
2014-06-05 08:17:59 +10:00
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
hiker
c579267e9a
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-05 07:51:46 +10:00
Flakebi
be39fc4f96
Reset speed when porting to a challenge
2014-06-04 19:06:45 +02:00
Flakebi
7ea68064d8
Fix improvements
2014-06-04 18:27:32 +02:00
Flakebi
4b70feede1
Improve scripts
2014-06-04 17:56:09 +02:00
Flakebi
d7b3e0f46a
Fix RegisterScreen
2014-06-04 16:45:54 +02:00
Flakebi
af6c121a22
Run whitespaces.py
2014-06-04 15:10:20 +02:00
Flakebi
4069e233fe
Unify some things
2014-06-04 15:06:35 +02:00
Arthur-D
cad6d5b3ae
Set player icons as 128x128 instead of 160x120 so the image ratio is correct.
2014-06-04 14:55:13 +02:00
Flakebi
4ae98f4610
Clean up when closing the window
2014-06-04 12:53:11 +02:00
Flakebi
39e5b57233
Add visual effect for disabled textfields
2014-06-04 12:49:41 +02:00
hiker
49a9ac54d5
Added a 'non-abortable' flag to the signout request. Re-enabled cancelling
...
ongoing downloads to allow for a quicker exit of STK.
2014-06-04 17:05:35 +10:00
hiker
c62cc7fbaa
Added CanBeDeleted class, which implements a timeout function. It is
...
used to make sure that (in this case) the NewsManager thread does not
need the file manager anymore when stk exists (which can only happen
on very very quick exists, and slow downloads). This avoids a potential
crash that the NewsManager thread could access the file manager after
the file manager was deleted.
2014-06-04 16:51:29 +10:00
Marianne Gagnon
9c1e371803
Allow disabling text boxes
2014-06-03 19:13:25 -04:00
Marianne Gagnon
6982a3de59
Work on porting feature unlocked screen to new cutscene system
2014-06-03 18:48:37 -04:00
vlj
803dc41ebb
Accidently reverted a commit that fixed a crash.
2014-06-04 00:08:14 +02:00
vlj
f0b3cbfcd0
Gather bloom effect to avoid extra texture read.
...
I have a .5ms win here...
2014-06-03 20:46:01 +02:00
vlj
55ddffaf54
Another round of big triangle port.
2014-06-03 20:28:42 +02:00
vlj
e5a5c78045
Use a big triangle instead of 2 to cover full screen.
...
This allows to rasterize a single primitive instead of two, and avoid
trashing the cache between the 2 triangles drawing.
2014-06-03 19:56:59 +02:00
vlj
d4fe539385
Do not write specular value in gi/diffuseenvmap
2014-06-03 17:40:21 +02:00
hiker
8c7b586f45
Fix 'remember password' setting being not remembered.
2014-06-03 21:10:39 +10:00
hiker
24f8918061
Fixed assertion in GP editor.
2014-06-03 15:52:33 +10:00
Sachith Hasaranga Seneviratne
540c7818aa
Scripts can now create action triggers by themselves. Example in tutorial
2014-06-03 10:09:03 +05:30
hiker
71b79cc72f
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-03 13:50:52 +10:00
hiker
663287930f
Sort karts by locked/unlocked state (and then alphabetically).
2014-06-03 13:50:28 +10:00
hiker
3d88bfa297
use isInGroup, and minor cosmetic changes.
2014-06-03 13:45:58 +10:00
hiker
9a366f8ee1
Simplified isInGroup test.
2014-06-03 13:42:41 +10:00
Sachith Hasaranga Seneviratne
146a71f46a
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-03 07:15:06 +05:30
vlj
e571afc43b
Speed up SSAO again
...
Use log2(xy) = log2(x) + log2(y), and approximate log2(alpha) =
log2(previous alpha) + .5.
Log2 is indeed a costly instruction.
2014-06-03 03:41:05 +02:00
vlj
164ffa2b4f
Spped up SSAO
...
Avoid using cos/sin too much, use sum of cos/sin formula instead.
2014-06-03 03:14:39 +02:00
vlj
783464ee81
Fix SSAO perf
...
I was using wrong mipmap count for linear depth rtt.
2014-06-03 01:59:22 +02:00
Marianne Gagnon
b5e6e5e054
Remove bogus check
2014-06-02 19:46:50 -04:00
Sachith Hasaranga Seneviratne
b14f79288d
Added ability for karts to jump to arbitrary locations on the map albeit somewhat inaccurately for now via the method jumpKartTo(kartID, targetx,target y) Notation is standard blender xyz
2014-06-02 21:26:27 +05:30
Sachith Hasaranga Seneviratne
88ea69fdc7
Added setVelocity to script functions for karts
2014-06-02 20:27:20 +05:30
konstin
0db8531a5d
Merge branch 'master' of https://github.com/supertuxkart/stk-code into a
2014-06-02 16:57:14 +02:00
konstin
ce661a4dd4
add a reverse spinner
2014-06-02 16:56:59 +02:00
Sachith Hasaranga Seneviratne
d908489ca7
Added script driven kart teleports
2014-06-02 19:55:37 +05:30
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
e08bbb5138
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-06-02 13:08:53 +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
hiker
0d789c3bd2
Don't create icons for guests (which are never shown).
2014-06-02 17:07:57 +10:00
hiker
eea9d6dbd8
Added FIXME and some comments so that we can look at this
...
strange call again when more networking code is added.
2014-06-02 16:30:53 +10:00
hiker
827286105e
Fix #1347 .
2014-06-02 15:54:23 +10:00
Marianne Gagnon
375fffaa80
Improvements to GPLose scene, similar to previous work on GPWin
2014-06-01 21:07:45 -04:00
Marianne Gagnon
0057e40e6d
Work on cutscene+menu combination. Fix bugs in GPWin cutscene, make them easier to work with in general
2014-06-01 21:03:48 -04:00
Marianne Gagnon
c7606cf6ef
Fix for nvidia
2014-06-01 20:19:31 -04:00
Marianne Gagnon
31f23b437e
Fix win-GP scene scale, so that effects render correctly
2014-06-01 20:18:28 -04:00
Vincent Lejeune
db9b9834d0
Separate point light and sun light in renderlights.
2014-06-02 01:23:18 +02:00
hiker
0358e55e2e
Added 'back' button to user screen.
2014-06-02 08:21:36 +10:00
hiker
c733378bf3
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-06-02 08:09:20 +10:00
hiker
5c959e07a2
Fixed multiplayer kart selection. Now guests are created on demand,
...
and are not saved to the players.xml file anymore.
2014-06-02 08:08:42 +10:00
vlj
63992a3908
Play with glTexStorage2D
...
Should reduce memory movements.
2014-06-01 02:48:03 +02:00
vlj
baf128059d
Add 3 new gl api calls
2014-06-01 02:24:19 +02:00
Marianne Gagnon
aff3b32bc6
compilation fix when c++2011 is enabled
2014-05-31 19:47:32 -04:00
auriamg
2877cedd1c
Merge pull request #1317 from konstin/random-gp
...
Changes in preparation for Random GP
2014-05-31 18:44:59 -04:00
konstin
03768db82a
avoid duplicate tracks
2014-05-31 22:32:55 +02:00
Vincent Lejeune
f31e5763d2
Fix condition.
2014-05-31 22:24:32 +02:00
konstin
ae2e6f77ad
Avoid duplicate name in GP editor
2014-05-31 22:12:01 +02:00
vlj
21317f561f
Remove sun specular if there is no shadow in track.
...
Avoid the ghost specular in star track.
2014-05-31 18:00:16 +02:00
Vincent Lejeune
5d095d4d24
Use options to determine if a fbo is needed.
2014-05-31 17:49:00 +02:00
konstin
6521e3d496
fix crash due to a dangling pointer
2014-05-31 17:28:20 +02:00
konstin
6bf1a33ddc
fix compilation failure due to merging
2014-05-31 16:50:01 +02:00
konstin
b7b116634d
solving merge conflicts with upstream
2014-05-31 15:28:52 +02:00
konstin
2534abeed2
trying to merge upstream
2014-05-31 15:11:05 +02:00
vlj
e9cb12a1fb
Used wrong condition.
2014-05-31 02:57:21 +02:00
vlj
5945ee878b
Start GI at the second tick.
2014-05-31 02:53:16 +02:00
hiker
5906cdb070
Merge branch 'NewRTTWidget' of github.com:supertuxkart/stk-code into NewRTTWidget
2014-05-31 10:45:55 +10:00
Marianne Gagnon
588b4189ac
Merge branch 'master' into NewRTTWidget
2014-05-30 20:44:38 -04:00
hiker
e39f2164b5
Removed OnlineProfile from ActivePlayer, since it was not used at all.
2014-05-31 10:26:02 +10:00
hiker
a0ee4d0bc5
Don't save guest players to the players.xml file.
2014-05-31 10:25:08 +10:00
vlj
6643f749b1
Remove unneeded profilers.
2014-05-31 02:04:32 +02:00
vlj
0f833b0619
Remove unneeded shaders/wrong assignements.
2014-05-31 01:59:33 +02:00
vlj
2d921ca588
Add a profiler for Dof
2014-05-31 01:52:10 +02:00
Marianne Gagnon
5e132f7410
Add GI to video options
2014-05-30 19:49:21 -04:00
vlj
ef91bf9549
Force RTT usage even in basic mode.
2014-05-31 01:26:47 +02:00
konstin
02677b38c2
Refactoring, renaming and cleaning-up
2014-05-30 20:26:44 +02:00
vlj
aa0691015a
Fix crash with 3.1 context when cleaning rtt.
2014-05-30 15:34:24 +02:00
hiker
a907df37ad
Save the last three stdout.log files (which is useful in diagnosing
...
crashes caused by e.g. a problem in a previous run).
2014-05-30 16:00:28 +10:00
Sachith Hasaranga Seneviratne
ad71674b2c
Added IDs to track objects, coding style fixes
2014-05-30 08:15:34 +05:30
Sachith Hasaranga Seneviratne
79d267ad9e
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-30 07:45:23 +05:30
hiker
8ea5110fd4
Fix crash caused by uninitialised variable.
2014-05-30 11:30:44 +10:00
Marianne Gagnon
a055d42829
A few tweaks
2014-05-29 21:08:12 -04:00
hiker
bb09ec9e37
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-30 11:03:46 +10:00
hiker
23e56e9454
Fixed indentation.
2014-05-30 11:03:32 +10:00
hiker
c705ad7732
Combined windows and non-windows handling of redirecting log to file (no
...
idea why there was ever made a distinction).
2014-05-30 10:54:08 +10:00
Vincent Lejeune
44f70454ad
Fix dof overwriting alpha value.
2014-05-30 02:32:01 +02:00
Marianne Gagnon
80b8851a9a
Fix merge
2014-05-29 20:04:10 -04:00
Marianne Gagnon
7e9252e5b3
Merge branch 'master' into NewRTTWidget
2014-05-29 20:00:58 -04:00
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
Sachith Hasaranga Seneviratne
329d11421b
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-29 10:40:36 +05:30
hiker
1cb7445e1b
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-28 21:41:56 +10:00
hiker
b18d7e75ac
Rewrote insertionSort to only require operator< (no >),
...
and removed the unnecessary operators.
2014-05-28 21:41:07 +10:00
Sachith Hasaranga Seneviratne
6015b66f9a
All existing script functions decoupled from script engine, moved into namespaces of Kart,Track and Physics.(Corresponding to their game engine equivalents
2014-05-28 13:51:13 +05:30
Sachith Hasaranga Seneviratne
8b9629fb5e
Cleaned up a bit
2014-05-28 13:21:45 +05:30
Sachith Hasaranga Seneviratne
34fec63f9c
Added Kart sub-namespace
2014-05-28 13:13:45 +05:30
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
Sachith Hasaranga Seneviratne
0fd792ac5b
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-28 12:27:41 +05:30
vlj
220719e507
Allow to toggle off GI.
2014-05-28 07:47:06 +02:00
vlj
40df4afc74
Support some debug option for GI
2014-05-28 07:47:06 +02:00
vlj
af16682a9e
Add GI support
2014-05-28 07:47:06 +02:00
Vincent Lejeune
5caf028a71
Add RH support
2014-05-28 07:47:06 +02:00
Vincent Lejeune
180bd939e0
Add RSM support
2014-05-28 07:47:06 +02:00
vlj
b3a8b13a10
Add all necessary fbo for RH
2014-05-28 07:47:06 +02:00
vlj
c96bc37975
Support 3 rtts
2014-05-28 07:47:06 +02:00
vlj
2dba00c45a
Support for layered without depth stencil
2014-05-28 07:47:06 +02:00
Marianne Gagnon
aa1418050d
Bugfix when GLSL disabled
2014-05-27 19:00:55 -04:00
hiker
fc228c96c4
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-28 08:57:45 +10:00
hiker
3f1029c55e
Fixed overwritten icons (which prevents player from using their
...
own icons).
2014-05-28 08:57:00 +10:00
auriamg
544d2206ef
Merge pull request #1343 from Flakebi/master
...
Add deactivated buttons and fix device-screen
2014-05-27 18:52:49 -04:00
konstin
feeab733e4
more intellegent track adding and removing
2014-05-27 20:49:02 +02:00
Flakebi
e5b4121aef
Fix behaviour of device-screen: Go to input-screen if pressing on the back button
2014-05-27 16:15:19 +02:00
Flakebi
d5de7d49d9
Add graphics for deactivated buttons
2014-05-27 16:07:53 +02:00
hiker
0494cc3164
1) Fixed saving of sessions ('save-session=1' was sent instead of
...
'save-session=true').
2) Made logout request same priority as stk-quit request, which means
that the logout request will executed before the quit, resulting
in players properly being marked as logged out.
2014-05-27 23:44:25 +10:00
sachith500
41a56c0cec
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-27 11:57:58 +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
hiker
36d705f021
Added 'always-show-login-screen' option, moved 'remember-password'
...
option from UI-options to UserScreen.
2014-05-27 15:36:44 +10:00
hiker
4ada050ca7
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-27 12:28:12 +10:00
hiker
a24e0cf5aa
Also hide the 'online' label if a user is renamed.
2014-05-27 10:44:01 +10:00
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
sachith500
3cb24f55d5
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-26 16:58:16 +05:30
hiker
726070b331
Use Log::, fix coding style issues.
2014-05-26 16:58:50 +10:00
Marianne Gagnon
5bc824a6d4
More improvements to new RTT
2014-05-25 19:26:40 -04:00
Marianne Gagnon
986563fdf8
Fix transparency
2014-05-25 18:45:54 -04:00
hiker
4cc59a56ce
Fixed renaming of local player, removed old rename dialog.
2014-05-26 08:25:33 +10:00
konstin
0d959a72aa
implement dynamic track listing (thanks to unitraxx for the help with the updating)
2014-05-25 21:16:42 +02:00
hiker
64492fb6cb
Merge branch 'pgabor-master'
2014-05-25 22:43:14 +10:00
hiker
79081f8ce8
Merge branch 'master' of https://github.com/pgabor/stk-code into pgabor-master
2014-05-25 22:38:03 +10:00
vlj
2cf9bb6d2c
Use UBO in MLAA
2014-05-25 03:21:08 +02:00
vlj
5ce3a6221a
Extent RTT_MLAA_COLORS to use alpha value
2014-05-25 03:13:53 +02:00
vlj
670c25dd26
Return alpha value in tonemap.
2014-05-25 03:13:19 +02:00
Marianne Gagnon
8afc03deff
Optimize kart switching
2014-05-24 20:57:38 -04:00
vlj
081a379dc0
RTT background is transparent without mlaa
2014-05-25 02:55:32 +02:00
vlj
0bd5d0973d
Set alpha to 0
2014-05-25 02:42:39 +02:00
Marianne Gagnon
bdc13d3bb9
Fix multiplayer kart select with new RTT widget
2014-05-24 20:34:39 -04:00
Marianne Gagnon
add14147a3
Fix RTT widghet clearModels() method
2014-05-24 20:22:34 -04:00
hiker
a07c931921
Removed file accidentally added (thanks to Konstin for noticing).
2014-05-24 22:12:04 +10:00
hiker
3b721d3803
New zipper icon by Connor.
2014-05-24 12:31:43 +10:00
hiker
22f5b39223
Fix linux compilation.
2014-05-24 12:16:44 +10:00
hiker
36cbb18e27
Fixed compiler warnings.
2014-05-24 12:07:47 +10:00
hiker
63bbf6e092
Converted files to standard unix format.
2014-05-24 12:00:25 +10:00
hiker
fc32fcc865
Fix crash when deleting the current player (also prevent the user from
...
deleting the last user, since STK (after login) needs a current player).
2014-05-24 11:52:09 +10:00
Marianne Gagnon
90ab6fec3a
Fixes to new RTT widget
2014-05-23 21:45:47 -04:00
hiker
6ca40916f7
Used proper icons for user screen.
2014-05-24 11:22:12 +10:00
Marianne Gagnon
5ce2b0b922
Work on new RTT widget, let there be light
2014-05-23 21:15:23 -04:00
vlj
a6f266ea40
Forgot to uncomment some lines
2014-05-24 03:02:27 +02:00
vlj
03ee8622de
Better fix for absent track
2014-05-24 03:01:08 +02:00
vlj
a4405ed6a0
Fix orientation
2014-05-24 02:56:28 +02:00
Marianne Gagnon
40d62e7c6c
Fix update
2014-05-23 20:51:02 -04:00
vlj
c6f4c8e0aa
Dirty fix for null track
2014-05-24 02:38:07 +02:00
hiker
ab70c55d02
Fixed infinite recursion.
2014-05-24 10:31:20 +10:00
hiker
05e6414cb8
Try to fix travisci compilation.
2014-05-24 10:24:37 +10:00
vlj
b461e4ba11
Merge branch 'NewRTTWidget' of https://github.com/supertuxkart/stk-code into NewRTTWidget
2014-05-24 02:23:51 +02:00
vlj
0acc7d18d0
Fill Matrix data before rendering Scene
2014-05-24 02:23:48 +02:00
hiker
e879dcf0a8
Merge remote-tracking branch 'origin/master' into new_login
2014-05-24 10:06:50 +10:00
hiker
3739e7515d
Support old configs (i.e. if icons don't exist, they will be
...
created at startup).
2014-05-24 10:05:54 +10:00
Marianne Gagnon
b1f34a09e7
One step forward
2014-05-23 19:56:24 -04:00
Marianne Gagnon
8417fd3394
A couple improvements to new RTT widget. Still does not work
2014-05-23 19:50:13 -04:00
konstin
aab6a1fcb6
adding sliders to dialogue
2014-05-23 22:55:25 +02:00
vlj
a1465b9039
Factorize draw code for pass1 shaders
2014-05-23 17:04:38 +02:00
vlj
9929678ba4
Fix a regression introduced by skybox fix
2014-05-23 16:55:55 +02:00
hiker
11d80d47ad
Added support for player icons.
2014-05-23 22:43:19 +10:00
sachith500
867f1607dd
Action triggers addressable by name, scripts can enable/disable action triggers
2014-05-23 14:39:03 +05:30
sachith500
cfef3e5456
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-23 08:54:38 +05:30
Deve
da41a06ae4
Add fallback for such exotic window managers as "larswm" which don't support netwm.
...
It's because Cand complains :)
2014-05-22 18:39:28 +02:00
sachith500
3c67a6159f
Moved scripts to stk-code/data/scripts and provided access to them via file_manager
2014-05-22 18:17:30 +05:30
sachith500
4578ddc073
Added animation enabling and reactivation
2014-05-22 12:39:46 +05:30
hiker
911faa0676
Fix #1339 .
2014-05-22 16:06:32 +10:00
sachith500
5056f2cc7e
Merge branch 'master' of https://github.com/supertuxkart/stk-code into newchanges
2014-05-22 11:35:21 +05:30
Marianne Gagnon
60fead1eea
Progress on new RTT widget, now I see a white rectangle
2014-05-21 20:13:36 -04:00
vlj
bca5beeaa7
Add a draw2dImage function to display glsl rtt
2014-05-22 01:29:40 +02:00
hiker
de8c6ac8b8
When a player logs in with an online account, reset any other saved
...
session for this online account (since these token are now invalid).
2014-05-22 08:21:41 +10:00
hiker
f4688fa621
Added support to change the online account for the same player.
2014-05-22 08:12:55 +10:00
hiker
c551ea0c14
Added online name of the player to be logged in/out to the sign in/out
...
message.
2014-05-22 07:45:19 +10:00
hiker
498c6b46db
Removed m_save_session, some code cleanup.
2014-05-22 07:44:26 +10:00
samuncle
d5f781433d
Adding a new particle system for falling leaves
2014-05-21 23:23:08 +02:00
sachith500
e96cf33cf5
Cleaned up a bit
2014-05-21 19:59:56 +05:30
sachith500
1db3d7bfd2
Deleted unused files
2014-05-21 19:59:41 +05:30
vlj
0b091e3095
Reset viewport size in model_view_widget
2014-05-21 14:30:10 +02:00
clbr
a52ad1318c
Merge pull request #1338 from amtkhdkr/mybranch
...
Email Validation
2014-05-21 13:53:36 +03:00
amtkhdkr
9c7f2d4de9
Whitespace cleanup
2014-05-21 16:18:56 +05:30
amtkhdkr
b7ab039cc6
Whitespace cleanup
2014-05-21 16:16:24 +05:30
amtkhdkr
efdaac1040
Use core::stringw functions
2014-05-21 16:14:44 +05:30
amtkhdkr
3577660f84
Rolling back changes,no need to edit here
2014-05-21 13:11:52 +05:30
amtkhdkr
397c2e4a33
Tested changes for wchar
2014-05-21 13:04:44 +05:30
Sachith Hasaranga Seneviratne
3023a12f2b
Scripting Engine built and tested with merges from latest master
2014-05-21 12:51:21 +05:30
amtkhdkr
091ff10039
Spaces removed
2014-05-21 12:05:27 +05:30
amtkhdkr
50119a493c
Checked for valid email id.
2014-05-21 11:57:56 +05:30
amtkhdkr
cd573d8446
Checked for valid email id.
...
Email id is checked for (z)(z)*@(z).(z)
where z is an alphanumeric character.
Following emails are valid: abc@xyz.com a@abc.com
d@ddyC00l@abc.com foo@ab.com
Following are invalid: abc foo@ @foo.com @.com .com@
2014-05-21 11:41:32 +05:30
samuncle
bffc615a49
Tweak the scattering value to reduce the effect
2014-05-21 02:36:48 +02:00
Marianne Gagnon
8b8a17de21
Improve material compat fallback + update one handwritten materials XML
2014-05-20 20:04:21 -04:00
Marianne Gagnon
441d941c41
First attempts at new RTT widget, does not work yet
2014-05-20 19:55:28 -04:00
hiker
1472e69c66
Merge remote-tracking branch 'origin/master' into new_login
2014-05-20 22:17:03 +10:00
hiker
8441dbbd32
Fixed saving login credentials. It's now possible to switch
...
user (and automatically a logout and login is triggered).
2014-05-20 22:13:26 +10:00
Marianne Gagnon
106c23a09b
Merge remote-tracking branch 'origin/master' into MaterialsRefactor
2014-05-19 20:48:08 -04:00
vlj
b87f420496
Spheremap: fix low brightness
2014-05-20 02:46:50 +02:00
Marianne Gagnon
f778f68649
Merge remote-tracking branch 'origin/master' into MaterialsRefactor
2014-05-19 20:37:44 -04:00
vlj
c79d96df69
Add lightviz to instanced node
2014-05-20 02:35:50 +02:00
vlj
c88d66a862
Add lightviz to spheremap
2014-05-20 02:35:49 +02:00
Marianne Gagnon
778649f182
More material work
2014-05-19 20:01:51 -04:00
Marianne Gagnon
6410cf8776
Start refactoring materials
2014-05-19 19:30:44 -04:00
vlj
3f1c85a897
Merge pull request #1336 from supertuxkart/shader-fix
...
Fix shader problems when UBO is disabled.
2014-05-20 00:19:02 +02:00
konstin
4339b96489
Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel
2014-05-19 19:53:31 +02:00
Stephen Just
493b7b7c69
Fix whitespace in glwrap.cpp
2014-05-19 10:02:35 -06:00
Stephen Just
0167e6d95a
Fix up whitespace in shaders.cpp
2014-05-19 09:59:13 -06:00
Stephen Just
f4992b80fc
Fix errors when compiling shaders with UBOs disabled
2014-05-19 09:57:31 -06:00
konstin
520fce6185
change the scaling of the objects in GPInfoDialog to be able to free space for randomGPInfoDialog
2014-05-19 16:33:29 +02:00
hiker
ebcce3da32
Avoid freeing potentially uninitialised variable.
2014-05-19 13:58:37 +10:00
Sachith Hasaranga Seneviratne
888c514dc7
Fixed Typo
2014-05-19 09:00:48 +05:30
Sachith Hasaranga Seneviratne
27de7c6f3c
MERGE STK into scripting branch
2014-05-19 08:27:15 +05:30
hiker
9ae67f5c7a
Merge remote-tracking branch 'origin/master' into new_login
2014-05-19 12:36:17 +10:00
vlj
84235b6491
Fix attempt for intel mesa
2014-05-19 00:25:25 +02:00
vlj
42db6d2bba
Forget another change
2014-05-19 00:13:17 +02:00
vlj
6b8df482df
Forget a hunk
2014-05-19 00:06:38 +02:00
vlj
df70681574
Fix attempt for linux
2014-05-19 00:05:52 +02:00
vlj
33f19e55b8
Fix for shadows.
2014-05-18 23:47:52 +02:00
vlj
31487814fe
Fix compile
2014-05-18 23:28:39 +02:00
Vincent Lejeune
0ccac4c552
Forget to remove some unused shaders.
2014-05-18 19:59:03 +02:00
Vincent Lejeune
eca3999d52
Do some cleaning
2014-05-18 19:56:25 +02:00
Vincent Lejeune
bf71c2f71d
Factorize code drawing shadows.
2014-05-18 19:45:52 +02:00
Vincent Lejeune
838b44fc00
Remove Cautics effect
...
It's not used anywhere and I have no way to test it so it's useless.
2014-05-18 19:28:53 +02:00
konstin
fd4df66878
Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel
2014-05-18 15:28:20 +02:00
konstin
0fdfe16a93
first try for a Random GP generator
2014-05-18 15:27:57 +02:00
hiker
2d4f2c5b28
Try to fix one more potential linux compilation problem.
2014-05-18 22:32:58 +10:00
hiker
c1194600c3
Try to fix my fix for linux compilation ;)
2014-05-18 22:09:04 +10:00
hiker
c9c3b289be
Try to fix linux compilations problems (apparently on some systems
...
Screen is defined, which then interferes with out Screen class).
2014-05-18 22:00:28 +10:00
konstin
359c846df4
Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel
2014-05-18 11:54:46 +02:00
Marianne Gagnon
f0e3ee8832
Fix kart shadow vs kart animation (for the main player only)
2014-05-17 21:57:06 -04:00
vlj
32b2359f21
Spheremap: Flip y and add light.
2014-05-18 03:39:53 +02:00
vlj
30f35cadde
Fix texture sampled by spheremap
2014-05-18 03:28:57 +02:00
vlj
a2e1724389
Use correct mapping for spheremap
2014-05-18 03:19:18 +02:00
vlj
dc7e6cb99f
Revert to spheremapped reflection
2014-05-18 03:01:24 +02:00
Marianne Gagnon
b91484a2ef
try to fix linux compilation
2014-05-17 19:29:59 -04:00
konstin
b9bf1e678a
Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel
2014-05-17 22:12:30 +02:00
vlj
7fcd7a3301
Add a fake skybox where no skybox is available
...
For spheremap shaders
2014-05-17 17:26:51 +02:00
konstin
b3247ef215
Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel
2014-05-17 17:14:29 +02:00
vlj
8673d36885
Merge branch 'fboencapsulate'
2014-05-17 17:05:31 +02:00
vlj
af34fa54e7
Fix displace effect.
2014-05-17 17:03:50 +02:00
Deve
b1395a8fe0
Install assets in data directory
2014-05-17 16:28:05 +02:00
Deve
4331a5c0a3
Few more checks for assets
2014-05-17 14:37:55 +02:00
hiker
4aa1fde07d
Don't show password field if player has a saved session.
...
If player changes online username, make password field visible again
and clear saved session data. In case of login problem, clear
saved session data.
2014-05-17 12:40:14 +10:00
hiker
40564534d2
Fixed callbacks in case of using the tabbed version of the UserScreen.
2014-05-17 12:17:19 +10:00
hiker
6f4579d55d
Only auto-login player if last time they played they were online.
2014-05-17 12:05:49 +10:00
hiker
1946df97be
Fixed start with no players (including aborting the create user screen),
...
added 'lastWasOnline' flag to enable saving of a login token even
when the account is used offline in between.
2014-05-17 11:43:05 +10:00
hiker
cf297c67b4
Fixed heading.
2014-05-17 11:40:16 +10:00
vlj
9c98012e09
Fix dof and transparent fog.
2014-05-17 03:09:21 +02:00
vlj
883b39591f
Width and height are passed by UBO
2014-05-17 02:39:55 +02:00
vlj
c465900ee3
Use rtt with fitting size.
2014-05-17 02:05:31 +02:00
Marianne Gagnon
4ff8b813fa
Create RTTs only when loading a track
2014-05-16 19:30:39 -04:00
vlj
12ecd4e58e
Attempt to fix travis ci
2014-05-17 00:56:16 +02:00
Vincent Lejeune
fef87b4853
Reenable splitscreen
2014-05-16 19:37:16 +02:00
Vincent Lejeune
a8a97d28ce
Move final blit to render.cpp
2014-05-16 19:28:15 +02:00
hiker
b38a31f303
Simplified handling of current player: instead of storing a flag
...
in each player, PlayerManager now just uses its m_current_player
to write this information in the players.xml file.
2014-05-16 15:39:33 +10:00
hiker
63b270283d
Merge remote-tracking branch 'origin/master' into new_login
2014-05-16 14:34:09 +10:00
hiker
c4ed2fbc7c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-16 14:29:06 +10:00
hiker
fd0b017b5f
Fixed compiler warnings (m_ssao is bool, not int).
2014-05-16 14:28:12 +10:00
hiker
71603816fa
Merge remote-tracking branch 'origin/master' into new_login
2014-05-16 14:21:13 +10:00
Marianne Gagnon
b049acb81d
Make STKMeshSceneNode destructor virtual, as it should
2014-05-15 21:17:01 -04:00
hiker
94457e7a53
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-16 09:56:19 +10:00
hiker
7544850012
Merge branch 'solistice-properties'
2014-05-16 09:55:50 +10:00
hiker
636f34160a
Finished using Log:: instead of printf, removed separate 'profile'
...
level, instead use 'profile' as component.
2014-05-16 09:54:32 +10:00
Marianne Gagnon
2b7dc07cda
Fix crash-on-second-load bug
2014-05-15 19:41:44 -04:00
hiker
629ecc8ecb
Removed old player management screen.
2014-05-16 08:50:10 +10:00
vlj
ecca6911d1
Encapsulate fbos in a class
2014-05-16 00:37:26 +02:00
hiker
1102702f5b
Removed saving of all online ids in players.xml file.
2014-05-16 08:31:58 +10:00
hiker
6650827784
Fixed various bugs in menu not showing up.
2014-05-16 08:24:15 +10:00
konstin
1e1633b88f
Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel
2014-05-15 21:49:46 +02:00
Bart Cools
61d9b7a0ea
Output of logging profile tests changed to the stdout.log instead of standard output. type of output also changed to space separated values instead of tsv
2014-05-15 18:30:16 +02:00
hiker
0459c33f66
Added a tabbed version of the user screen, and integrated it into
...
the option menu of STK.
2014-05-15 22:59:21 +10:00
hiker
f4a5949198
Fixed invalid memory read (thanks to valgrind).
2014-05-15 15:37:23 +10:00
hiker
cc03578056
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-15 12:41:35 +10:00
hiker
a3c01a6b2a
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-15 11:17:36 +10:00
hiker
d3f6aa5e52
Fixed some memory problems reported by valgrind.
2014-05-15 11:17:05 +10:00
Marianne Gagnon
78d8199de8
disable crash reporter in debug mode
2014-05-14 20:10:23 -04:00
Marianne Gagnon
aae7d01e57
Try to make the custom GUI settings popup work on any resolution
2014-05-14 19:29:39 -04:00
hiker
717a989bf8
Fixed --profile-laps command line parameter.
2014-05-15 09:08:18 +10:00
hiker
137b5033dd
Merge remote-tracking branch 'origin/master' into new_login
...
Conflicts:
src/karts/controller/skidding_ai.cpp
2014-05-15 08:58:29 +10:00
hiker
4f14ddb944
Fixed crash when local user name is empty.
2014-05-15 08:57:02 +10:00
hiker
71d4e380b3
Disabled guest account.
2014-05-15 08:56:46 +10:00
hiker
5966cefed9
Merge pull request #1325 from solistice/properties
...
small patch for --no-graphics mode and small bug fix
2014-05-15 08:42:31 +10:00
konstin
53a432ea70
making the dialog work with a predefined GP
2014-05-14 21:41:12 +02:00
konstin
3f5c2138c3
Start Using InitAfterDrawingTheHeader
2014-05-14 21:13:08 +02:00
konstin
556e537ce5
Adding RandomGPInfoDialog-class with few content
2014-05-14 21:05:48 +02:00
konstin
e981489f06
moving part of the constructor to a method for a new derived class
2014-05-14 20:44:15 +02:00
konstin
9d2a075289
reverting malicious change
2014-05-14 20:05:29 +02:00
konstin
1e91b9813f
Merge branch 'devel' of https://github.com/konstin/stk-code into devel
2014-05-14 20:03:33 +02:00
konstin
84d1d8e511
moving picture 20px to the left
2014-05-14 20:03:13 +02:00
konstin
42f39db170
removing old comment and moving the picture 10px to the left
2014-05-14 20:01:12 +02:00
konstin
d997780cd7
moving the definition of the size of a GPInfoDialog to it's header
2014-05-14 19:57:13 +02:00
Bart Cools
f521ba0242
fix issue #1328
2014-05-14 17:57:22 +02:00
Bart Cools
6a6ba94a16
added check for --no-graphics argument
2014-05-14 17:37:28 +02:00
Bart Cools
1fdeaf375a
Merge branch 'master' of https://github.com/supertuxkart/stk-code into properties
2014-05-14 14:19:08 +02:00
Bart Cools
585b79f555
small patch for --no-graphics mode
2014-05-14 14:06:09 +02:00
hiker
ce52bf90e4
Merge branch 'new_login' of github.com:supertuxkart/stk-code into new_login
2014-05-14 14:10:10 +10:00
hiker
d9daf928e5
Merge remote branch 'origin/master' into new_login
2014-05-14 14:06:06 +10:00
vlj
229b461a6c
SSAO: Less abrupt transition
2014-05-14 03:26:43 +02:00
vlj
1d4bcd5ade
SSAO: Increase beta constant to avoid error
2014-05-14 02:27:17 +02:00
vlj
86c8b9f83d
Some tweaking to make ssao more apparent
2014-05-14 02:12:18 +02:00
Marianne Gagnon
474bbb4373
Try to convert icon rendering to new helper function (for GL3 support)
2014-05-13 20:00:16 -04:00
vlj
dd81f02fea
Fix for #1324
2014-05-14 01:51:40 +02:00
Marianne Gagnon
9410a0fd90
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-05-13 19:39:42 -04:00
Marianne Gagnon
03ad82267a
Fix OSX 10.7 compilation
2014-05-13 19:39:19 -04:00
vlj
0ccac5d316
Replace texture2D by texture in dof.frag
2014-05-14 00:59:51 +02: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
hiker
09e8a39938
More testing.
2014-05-14 07:56:45 +10:00
konstin
d6e9358fd5
Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel
2014-05-13 20:05:27 +02:00
Vincent Lejeune
59484ea09a
DS buffer is not linear and cant be mipmapped
...
Use the method provided by SAO paper (ie convert to linear and then
mipmap)
2014-05-13 19:40:30 +02:00
hiker
844886075b
Fixed format for TODO file.
2014-05-13 22:52:14 +10:00
hiker
352393856c
Test commit.
2014-05-13 22:51:12 +10:00
hiker
c1575266ac
Merge remote-tracking branch 'upstream/master'
2014-05-13 22:47:07 +10:00
Vincent Lejeune
20959f970a
Avoid displacement related fbo bind in non advanced pipeline
2014-05-13 01:12:43 +02:00
Marianne Gagnon
bcc46b149e
Remove call to createMeshWelded, now handled in B3D exporter
2014-05-12 19:03:40 -04:00
vlj
26d48cdad0
SSAO: Stronger blur + tweak param
...
Use another algorithm to have gaussian blur that lets us customise
radius more easily.
2014-05-12 23:59:17 +02:00
vlj
bba9e3ca2c
Add a 17 tap blur filter
...
and use it for SSAO
2014-05-12 20:49:47 +02:00
vlj
967d7a0316
Use mipmap nearest
2014-05-12 20:16:37 +02:00
vlj
8e17ae90b6
Resolution independent ssao
2014-05-12 20:13:12 +02:00
Deve
0b463f5222
Allow to run xrandr instead of vidmode as an option
2014-05-12 20:08:15 +02:00
konstin
d6b75dc2ea
Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel
2014-05-12 19:45:43 +02:00
Vincent Lejeune
96babc81ad
Reenable custom light radius
2014-05-12 19:37:00 +02:00
Deve
e8b4926b0b
Fixed #1313 .
...
In some cases STK was barely playable because of very low refresh rates (25-30Hz).
This may be caused by last changes in display drivers. I remember that previously refresh rates for resolution were in order from the lowest to the greatest. Now I see it in reversed order.
Irrlicht didn't check refresh rates and always set the last available for specified resolution.
Now we use the highest available refresh rate.
Perhaps we should use xrandr library instead of vidmode. It should be much smarter and maybe would solve some multimonitor issues.
2014-05-12 18:43:36 +02:00
vlj
23ba597a1c
SSAO: Use int rounding
2014-05-12 18:39:33 +02:00
konstin
6f9ae6e510
get back into working state
2014-05-12 14:59:09 +02:00
konstin
a52656e52a
Merge branch 'master' of https://github.com/supertuxkart/stk-code into random-gp
2014-05-12 14:17:15 +02:00
vlj
229b72f84a
Render SSAO at fullscreen resolution.
2014-05-12 01:06:33 +02:00
vlj
384c9f2c77
Merge branch 'SAO'
2014-05-12 00:35:08 +02:00
vlj
4fcec02123
Remove ssao depth guard.
2014-05-12 00:34:44 +02:00
vlj
7e1625da5e
Tweak SSAO params.
2014-05-12 00:30:36 +02:00
vlj
f8544493b6
Improve SSAO perf
2014-05-12 00:14:50 +02:00
vlj
11b7d20ad8
Use the mipmap trick to speed up ssao.
2014-05-12 00:03:42 +02:00
Vincent Lejeune
41e02e0880
Allow depth test on debug physic view
2014-05-11 18:20:30 +02:00
Vincent Lejeune
567974aeed
Use dFdX/dFdY to compute normals in SSAO.
2014-05-11 18:09:48 +02:00
konstin
82a36fe7de
Finally just commenting it out (easier to manage)
2014-05-11 18:09:41 +02:00
konstin
2a01df93d2
removing duplicate code
2014-05-11 18:04:28 +02:00
Vincent Lejeune
e5410e23a2
Use Alchemy SSAO
2014-05-11 18:00:30 +02:00
konstin
eabd10127f
move check for a valid number of tracks in a GP to GrandPrixData
2014-05-11 17:52:56 +02:00
konstin
57db9cf858
obvious stuff
2014-05-11 17:47:09 +02:00
konstin
3a8bba6cad
remove unnecessary in tracks_screen.cpp
2014-05-11 17:42:50 +02:00
konstin
bfc68472fb
remove unnecessary assertions
2014-05-11 17:30:22 +02:00
konstin
e48834627b
Merge branch 'master' of https://github.com/supertuxkart/stk-code into random-gp
2014-05-11 17:16:21 +02:00
samuncle
518a5fd8ef
Fix pre-c++2011 + improved waterfall effect
2014-05-11 02:58:23 +02:00
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
c0a7c76886
Fix pre-c++2011 build, hopefully
2014-05-10 20:43:43 -04:00
Marianne Gagnon
fbd33420c2
cull by distance, to improve performance
2014-05-10 20:38:10 -04:00
Vincent Lejeune
e16c6af04a
Forget a sizeof(float).
2014-05-11 02:24:17 +02:00
Vincent Lejeune
325ec8e754
Fix wrong buffer size and factorize state changes.
2014-05-11 02:13:04 +02:00
Vincent Lejeune
b286069108
Use batched draw call to draw lines.
2014-05-11 01:59:59 +02:00
Marianne Gagnon
4e9f199008
Save raw floats and not vectors
2014-05-10 19:50:24 -04:00
Marianne Gagnon
bdabbedf28
fix silly mistake in previous commit
2014-05-10 19:31:30 -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
Vincent Lejeune
648d076e00
Premultiply alpha for particles too.
2014-05-10 20:58:43 +02:00
Vincent Lejeune
6936f30b36
Premultiply alpha for billboards.
2014-05-10 20:49:30 +02:00
Vincent Lejeune
6bf67523b9
Prettier gpu timing label.
2014-05-10 20:16:27 +02:00
Vincent Lejeune
5d3b6bba4d
Avoid shadow disappearance
2014-05-10 20:00:52 +02:00
Vincent Lejeune
a3f1e4bad1
Explicitly use S3TC texture compression.
2014-05-10 02:52:58 +02:00
Vincent Lejeune
f7aa586eb2
Check if compression was successful before caching
...
Fix a crash on radeon.
2014-05-10 02:41:45 +02:00
Vincent Lejeune
b72c1ad0c5
Fix for disappearing objects.
2014-05-10 02:28:02 +02:00
vlj
af67c8c3b8
Merge pull request #1309 from gupascal/hd-textures-option
...
A "Use High definition textures" option
2014-05-10 01:37:23 +02:00
vlj
07f68db6c3
Fix wrong mouse poisition report.
...
m_mouse_pos was always (0, -1) in some case, which makes profiling hard.
2014-05-09 19:55:06 +02:00
vlj
cd6e7f3d90
Fix an assert.
2014-05-09 19:32:52 +02:00
vlj
b4e9a00574
Fix profiler
2014-05-09 18:54:06 +02:00
vlj
5b511fedd8
Lights: Culling was not using correct cam position
2014-05-09 18:46:07 +02:00
vlj
bc2c355cd8
Shadows: Emit an error instead of sending wrong corners.
2014-05-09 18:41:24 +02:00
vlj
c5e31c96b1
Simplify mesh temporary.
...
Until we move this code to the exporter.
2014-05-09 15:11:18 +02:00
vlj
94c65434df
Add some more perfs counter to post process
2014-05-09 15:07:07 +02:00
vlj
59f586c5ee
Add some more gpu timer.
2014-05-09 14:54:42 +02:00
vlj
3e6ab6d7b6
Factorize SSAO in its own code.
2014-05-09 14:44:53 +02:00
Marianne Gagnon
d78482ac67
Better react to small screens
2014-05-08 20:50:34 -04:00
Marianne Gagnon
9ab068a72d
Remove accidentally committed file
2014-05-08 20:40:39 -04:00
konstin
eae8183bf5
readding random gp displaying
2014-05-08 22:44:42 +02:00
konstin
73acf5e0ef
Removing Random GP for pull request
2014-05-08 22:36:37 +02:00
konstin
5ea5de69cf
preparing tracks_screen by adding a randon GP icon
2014-05-08 20:57:19 +02:00
konstin
58950f6b94
Merge branch 'master' of https://github.com/supertuxkart/stk-code into random-gp
2014-05-08 20:43:49 +02:00
Guillaume P
32b6f42ef4
Fix Travis CI build.
2014-05-08 20:40:22 +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
Guillaume P
af91b8b4ae
Extend caching abilities to compressed textures. Also, improve the structure of cache directories to fit new needs.
2014-05-08 18:04:22 +02:00
hiker
8d4b33f221
Removed tabs, and use a separate screen instead. Some more refactoring
...
to make remember-me a global setting.
2014-05-08 22:17:15 +10:00
Stephen Just
1070fd7395
Fix segfault on Linux/Mesa
...
For some reason, glGetString(GL_EXTENSIONS) is failing. This will need more investigation
2014-05-07 23:19:39 -06:00
hiker
15f43a0537
Merge branch 'master' into new_login
2014-05-08 13:35:40 +10:00
Vincent Lejeune
5f6829b071
Simplify some code and have a function that render a scene from a cam pov
2014-05-08 03:14:00 +02:00
Vincent Lejeune
1746835cae
Factorize godray visibility test in its own function.
2014-05-08 02:14:31 +02:00
Vincent Lejeune
8a64d411d9
Remove debug arount scoped timer.
2014-05-08 02:07:03 +02:00
Marianne Gagnon
e1a5f8254b
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-05-07 19:35:35 -04:00
Marianne Gagnon
c8638ec968
Add basic support to display GPU markers in the profiler
2014-05-07 19:35:31 -04:00
Vincent Lejeune
4c9e2afe31
Cast some char to unsigned char
2014-05-08 01:25:37 +02:00
Vincent Lejeune
a73f03a2c4
Make use of gl_amd_vertex_shader_layer when available
2014-05-08 01:16:02 +02:00
vlj
cc368103b0
Remove an extra EndQuery
2014-05-08 00:03:21 +02:00
vlj
fd7399d983
Use instancing to expand shadows instead of GS
2014-05-07 23:57:07 +02:00
hiker
6fb9832fc2
Added box around screen, hide 'guest' if no online login is requested.
2014-05-07 17:10:02 +10:00
hiker
6c9fbb8dec
Fixed hanging dialog if no password was entered.
2014-05-07 16:55:26 +10:00
hiker
1eed1272ad
If a player is already selected when entering the UserScreen,
...
display the name of the player instead of 'login'.
2014-05-07 16:47:08 +10:00
hiker
83c29b0778
Instead of individual 'remember-me' settings, use one global setting.
2014-05-07 16:39:09 +10:00
hiker
d4b263761e
Fix #1231 - stk-code/data not found on windows (secondary report).
2014-05-07 13:23:22 +10:00
hiker
6fab5e89fd
Merge remote branch 'origin/master' into new_login
2014-05-07 13:04:35 +10:00
hiker
0be01a5977
Added rename functionality.
2014-05-07 08:00:03 +10:00
konstin
a22b407568
removing git blame output file in src
2014-05-06 19:46:20 +02:00
vlj
8e21810282
Encapsulate GPUTimer calls
2014-05-06 17:50:29 +02:00
hiker
737c8a9983
Added 'delete player' functionality.
2014-05-06 16:52:36 +10:00
hiker
bb18d65ccd
Select the current player by default.
2014-05-06 11:39:55 +10:00
hiker
bef811e098
Fixed login problems (e.g. only online log in worked), improved handling
...
of error message, removed need for m_login_successful.
2014-05-06 08:21:53 +10:00
Stephen Just
efb85943d1
Fix for #1297 . DoF shader compiles in mesa now. The other problem noted
...
in the issue was just texture compression + intel.
2014-05-05 07:59:20 -06:00
hiker
d847e8de00
Renamed StoryModeLobby to UserScreen.
2014-05-05 21:17:46 +10:00
hiker
6010831654
Removed original login screen, made the new login screen a tab.
...
Removed guest tab (and started to use a checkbox for that for now).
Work in progress.
2014-05-05 20:46:48 +10:00
Vincent Lejeune
65e4177f5c
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-05-05 01:47:00 +02:00
Vincent Lejeune
d316263660
Tweak light extent again to improve perf
2014-05-05 01:46:57 +02:00
hiker
00cf9a3dbe
Merge remote branch 'origin/master' into new_login
2014-05-05 09:20:37 +10:00
hiker
fc3213a47d
Fixed linux compilation.
2014-05-05 09:17:19 +10:00
hiker
5ff9d7f198
Block new StoryModeLobbyScreen while login is in progress (and display ...
...
while this is happening). This allows to show error messages (e.g. user can
re-enter the password if login failed, without having to go to another menu
or perhaps even missing the fact that they are not logged in).
2014-05-05 08:59:27 +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
Vincent Lejeune
d6d7c6179c
Simplify pointlight.vert
2014-05-04 19:46:21 +02:00
Vincent Lejeune
94ae8fb21e
Use a more tighly fitting quad for pointlights.
2014-05-04 19:21:09 +02:00
Marianne Gagnon
30929ef0a7
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-05-03 20:22:26 -04:00
Marianne Gagnon
ceb8265203
Merge branch 'NewGPCutscene'
2014-05-03 20:22:07 -04:00
Marianne Gagnon
bee4dcf36c
Work on new GPWin screen. Seems to work well now
2014-05-03 20:21:34 -04:00
Marianne Gagnon
6b3d1a4770
More work on porting GP win scene
2014-05-03 19:42:38 -04:00
Marianne Gagnon
dc5d7f707d
Work on GP end cutscene
2014-05-03 19:19:00 -04:00
vlj
35df307c3f
Tweak light extend.
2014-05-03 23:44:27 +02:00
vlj
5e62347d11
Fix attempt for #1308
2014-05-03 17:36:27 +02:00
Guillaume P
ab824f0ac3
Remove the use of cbegin and cend. (c++11 features)
2014-05-03 14:39:09 +02:00
Guillaume P
a863757365
Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option
...
Conflicts:
data/gui/custom_video_settings.stkgui
src/states_screens/dialogs/custom_video_settings.cpp
2014-05-03 10:32:47 +02:00
Guillaume P
b4b2e44a08
Regenerate a cached texture when the original is newer.
2014-05-03 10:15:16 +02:00
Guillaume P
de5375ab9f
Add subdirectories in the cache directory to organize textures of each track.
2014-05-03 09:35:51 +02:00
Marianne Gagnon
423a833bb8
Add DOF checkbox to the graphics options
2014-05-02 19:02:58 -04:00
Marianne Gagnon
1b7c9ee1e2
Initial work to port GP win/lose cutscenes to new system
2014-05-02 18:47:43 -04:00
Vincent Lejeune
2d34bd0f47
Do not built grass shadow shader
2014-05-02 23:47:24 +02:00
Vincent Lejeune
b22066d0ab
Implement GL_ELAPSED_TIME query
...
This allows to measure gpu execution time very accurately.
2014-05-02 23:47:12 +02:00
Guillaume P
14508bc2ac
Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option
2014-05-02 19:18:58 +02: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
vlj
2a1623d8ca
Use a more efficient screen to view conversion
...
Also use the opportunity to use UBO where possible.
2014-05-02 18:11:34 +02:00
vlj
2f1578ba32
Potential fix for #1305
2014-05-02 13:54:23 +02:00
vlj
401471fc18
Allow to toggle dof off
2014-05-02 13:44:10 +02:00
Marianne Gagnon
3ce6dde466
try increasing light count
2014-04-30 19:43:27 -04:00
hiker
d7219f3a2d
Added 'ok' button to 'new player' dialog. I can't seem to get them next
...
to each other, so for now they are just on top of each other.
2014-04-30 16:57:22 +10:00
hiker
bb737d0448
Added error sfx.
2014-04-30 16:57:04 +10:00
hiker
af9fb24d2e
Handle disabled internet (and provide a message to the user if he
...
tries to login with internet disabled).
2014-04-30 16:37:05 +10:00
hiker
a52b92083e
Fixed typo.
2014-04-30 12:25:34 +10:00
hiker
5c7d29830d
Fixed compiler warning.
2014-04-30 12:23:54 +10:00
hiker
3b8d988cd2
Fixed compiler warnings.
2014-04-30 11:34:53 +10:00
hiker
5124ba2bed
Merge remote-tracking branch 'origin/master' into new_login
2014-04-30 11:28:13 +10:00
konstin
b0169d2896
small corrections in grand_prix_data.cpp
2014-04-30 10:55:38 +10:00
konstin
367acd7738
Almost rewrite of GrandPrixData::reload()
2014-04-30 10:54:42 +10:00
konstin
d747b6af3f
Minor changes to the grand prix editor
2014-04-30 10:39:27 +10:00
hiker
3487f70740
Minor correction to patch from konstin.
2014-04-30 10:35:06 +10:00
konstin
ca08ee9d86
fixed identing, added comments, corrected spelling, etc.
2014-04-30 10:19:23 +10:00
Marianne Gagnon
4bddf29320
Fix bullet assertion failure
2014-04-29 19:48:54 -04:00
hiker
13024bf6ef
On first time start the player is automatically asked to create a new
...
player with a sensible default name.
2014-04-30 08:42:43 +10:00
hiker
ecef685b32
Adding new players now works.
2014-04-30 07:54:49 +10:00
Guillaume P
fac9cafa96
Create the directory where resized textures will be cached.
2014-04-29 18:57:36 +02:00
hiker
b412d0507d
Merge pull request #1303 from leyyin/master
...
Fix some bugs in the online screens
2014-04-29 16:25:18 +10:00
Marianne Gagnon
8d2b56a34a
Improve flying mode, part 2
2014-04-28 19:55:41 -04:00
Marianne Gagnon
389ec42bde
Improve flying mode
2014-04-28 19:55:30 -04:00
hiker
6f5c523e86
Fixed display of players, thanks to auria.
2014-04-29 09:46:00 +10:00
hiker
396e3bb54e
Merge remote-tracking branch 'origin/master' into new_login
2014-04-29 09:10:37 +10:00
hiker
812da3e0c0
Some work on new login screen, though wip atm.
2014-04-29 09:02:44 +10:00
Guillaume P
03fbdc260d
Add a new option for high-definition textures.
2014-04-28 18:42:23 +02:00
hiker
2f17264f39
Very eary first version of a new login screen.
2014-04-28 16:41:47 +10:00
hiker
b3291caea2
Moved 'startup now' code in separate function to make main more readable.
2014-04-28 07:51:24 +10:00
Vincent Lejeune
18aa119890
Tweak light attenuation.
...
Doesnt really change the look of the light but reduce their extent.
2014-04-27 18:31:00 +02:00
Vincent Lejeune
9ac57c3919
Tigher fit of light extent
2014-04-27 18:04:39 +02:00
Marianne Gagnon
2ee7f7a2e8
Bugfix : use ambient light from the sun when SH maps are not used
2014-04-26 20:04:16 -04:00
Daniel Butum
a769563878
Fix back button size in guest login screen
2014-04-26 14:03:14 +03:00
Daniel Butum
5ecfed293d
Fix back button in the register screen and login as guest
2014-04-26 13:42:30 +03:00
Daniel Butum
fc5da9eb9a
Fix back button in login screen and fix 'move on uninitialised value in MusicInformation'
2014-04-26 13:33:09 +03:00
vlj
a2e202a695
Missing "track->hasShadows" check
2014-04-26 02:22:33 +02:00
Marianne Gagnon
924e09b3e9
Very slight tweak
2014-04-25 20:02:16 -04:00
vlj
2ca11c3166
Auria provided tonemap coefficients
2014-04-26 02:00:50 +02:00
vlj
3e4254b3a7
Tonemap: Use J. Hable filmic operator
...
It gives better result on stk enterprise, slightly saturating blacks.
2014-04-25 17:57:10 +02:00
Marianne Gagnon
97b6db3fdc
Honor the per-track flag to disable god rays
2014-04-24 19:24:23 -04:00
vlj
c5fbd5ff84
Reenable ability to change exposure/lwhite.
2014-04-25 00:59:02 +02:00
vlj
5b8b1a8b57
Temporary comment out exposure/lwhite settings
2014-04-25 00:29:33 +02:00
Vincent Lejeune
7239154a3a
NormalMap should cast shadows too
2014-04-24 21:23:32 +02:00
Vincent Lejeune
84ddd7119e
Use glPolygonOffset to remove shadow acne
...
It's a 2002 trick from M. Kilgard
2014-04-24 21:02:24 +02:00
vlj
85e720a58f
Shadow: tweak bias to remove acnee
2014-04-24 18:33:05 +02:00
vlj
ef07b25202
Make possible to tweak exposure/lwhite in adm
2014-04-24 17:47:17 +02:00
hiker
84a1e32ade
Let cmake test if stk-assets exists in the expected place. If not,
...
cmake is aborted with an error message. The option -DCHECK_ASSETS=off
option can be used to disable this test. The latter is also used
for travis.
2014-04-24 14:22:38 +10:00
hiker
9c35da4b6c
Merge branch 'master' of https://github.com/abhishek1995/stk-code into abhishek1995-master
2014-04-24 14:01:37 +10:00
hiker
370e2e4935
Merge remote-tracking branch 'origin/master' into new_login
2014-04-24 12:26:29 +10:00
samuncle
ba3cce6046
Limit the DoF influence
2014-04-24 02:44:34 +02:00
Marianne Gagnon
3f17545541
Use hasShadows flag from Track
2014-04-23 19:19:11 -04:00
Marianne Gagnon
2e53328847
Add debug sliders for vlj
2014-04-23 19:03:23 -04:00
hiker
ea2b797bb3
Keep track of online ids used in the player.xml file.
2014-04-24 08:17:44 +10:00
hiker
d7684668db
Fixed comments.
2014-04-24 08:16:19 +10:00
vlj
b939d06be5
Properly add Depth of Field
2014-04-23 22:08:37 +02:00
vlj
22d993dfbe
Merge branch 'tonemap'
...
Conflicts:
data/shaders/tonemap.frag
2014-04-23 18:20:30 +02:00
vlj
f83eb399fd
Revert "Revert "Fix a typo in tonemap.frag""
...
This reverts commit 812b2afcd8 .
2014-04-23 18:19:46 +02:00
vlj
19d2f1f9ac
Revert "Revert "Use a less intrusive delta value""
...
This reverts commit 230076ffcb .
2014-04-23 18:19:00 +02:00
vlj
77795c796f
Revert "Revert "Enable tonemap.""
...
This reverts commit e57339841b .
2014-04-23 18:18:43 +02:00
vlj
fb56a4086f
Fix normalmap roughness
2014-04-23 18:09:48 +02:00
Vincent Lejeune
1bb4926ba2
Reorder post processes effects.
2014-04-23 18:09:48 +02:00
Vincent Lejeune
eb0c948e41
Tweak exposure/whiepoint/saturation
2014-04-23 18:09:47 +02:00
hiker
7bab6fdb82
Removed swap file added accidentally.
2014-04-23 14:39:16 +10:00
Vincent Lejeune
96c8180dfc
Remove color_in, it's been superseeded
...
Keep the shader because it will be partly used for dof.
2014-04-22 19:51:36 +02:00
Vincent Lejeune
da15aebcda
SSAO: Clamp to 0.
2014-04-22 18:22:39 +02:00
Vincent Lejeune
6f16831d00
Revert "Some color are negative, clamp them in loglum"
...
This reverts commit 43df357cfb .
2014-04-22 18:18:18 +02:00
hiker
2e3adee1a2
Merge branch 'master' of https://github.com/whichrakesh/stk-code into whichrakesh-master
...
Fix counting of bananas only for current player. Fixed conflicts.
Conflicts:
src/achievements/achievement_info.hpp
2014-04-22 17:20:40 +10:00
hiker
469ac9c433
Don't fire a cake if the target kart is invulnerable. Some cosmetic
...
changes to reduce line length, and added more comments.
2014-04-22 16:53:12 +10:00
hiker
ef341344e7
Merge branch 'skiddingAI' of https://github.com/gupascal/stk-code into gupascal-skiddingAI
2014-04-22 14:29:35 +10:00
hiker
886e7614e2
Fixed -help command line options (which was broken elsewhere before).
2014-04-22 14:24:32 +10:00
hiker
1bff514c27
Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin-master
2014-04-22 14:14:49 +10:00
hiker
c8d679139f
Improved documentation.
2014-04-22 14:13:27 +10:00
Vincent Lejeune
17ba0f515c
Revert "Use some realist order of magnitude of light"
...
This reverts commit 2aa6676050 .
2014-04-22 02:32:42 +02:00
Vincent Lejeune
b0e56ca2b0
Use some diffent value/equation for tonemap
2014-04-22 02:29:22 +02:00
Marianne Gagnon
5373390fac
Load textures for ambient lights separately from skybox textures
2014-04-21 20:25:51 -04:00
Vincent Lejeune
e57339841b
Revert "Enable tonemap."
...
This reverts commit a0e63dea46 .
2014-04-22 00:44:58 +02:00
Vincent Lejeune
230076ffcb
Revert "Use a less intrusive delta value"
...
This reverts commit d7e3976ef5 .
2014-04-22 00:44:49 +02:00
Vincent Lejeune
812b2afcd8
Revert "Fix a typo in tonemap.frag"
...
This reverts commit b8d5719a82 .
2014-04-22 00:44:39 +02:00
Vincent Lejeune
d4718df127
Revert "Use some realist order of magnitude of light"
...
This reverts commit 2aa6676050 .
2014-04-22 00:44:08 +02:00
Vincent Lejeune
b8d5719a82
Fix a typo in tonemap.frag
...
Also tweak whitepoint and exposure. They should be manually set by track
somehow.
2014-04-21 22:37:26 +02:00
vlj
2aa6676050
Use some realist order of magnitude of light
2014-04-21 19:40:10 +02:00
vlj
d7e3976ef5
Use a less intrusive delta value
2014-04-21 19:39:39 +02:00
vlj
43df357cfb
Some color are negative, clamp them in loglum
...
I have yet to investigate how the pipeline can produce negative values
somewhere.
2014-04-21 19:29:13 +02:00
vlj
a0e63dea46
Enable tonemap.
2014-04-21 02:33:12 +02:00
vlj
2e1b0ac9f4
Avoid negative value when Yxy->RGB
2014-04-21 02:19:09 +02:00
vlj
8947242de4
Add proper tonemap, although disabled.
...
It currently generates way too much HDR.
2014-04-21 01:52:44 +02:00
vlj
1d40851600
Fix light shaft
2014-04-21 00:52:18 +02:00
vlj
d0afcce32d
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-20 02:56:10 +02:00
vlj
878a639a84
Another ssao tweak.
2014-04-20 02:56:07 +02: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
8e579d4874
Add UBOs flag to graphics options
2014-04-19 20:23:49 -04:00
vlj
e8b36f2490
Fix for shadow acne in chocolate.
2014-04-20 02:20:09 +02:00
vlj
87248b46f3
Tweak shadows CSM split.
2014-04-20 02:01:29 +02:00
vlj
fde29887f0
Fix roughness in instanced mesh.
2014-04-20 01:24:38 +02:00
Marianne Gagnon
478e904d1c
Remove debug logging
2014-04-19 19:15:38 -04:00
vlj
18b2b341e7
Dont stick to integer coordinate for CSM.
2014-04-20 00:24:37 +02:00
vlj
1291d0cc93
Increase shadow fidelity.
2014-04-20 00:21:30 +02:00
vlj
a457b9f423
Shadows: Clean shaders.
2014-04-20 00:04:49 +02:00
vlj
dd3e15b298
Debug: display cascade in shadow debug mode
2014-04-19 23:57:27 +02:00
vlj
5d3d44e400
Avoid an extra blit in bloom.
2014-04-19 23:29:42 +02:00
vlj
ce6397c5e7
Remove an leftover return.
2014-04-19 23:20:40 +02:00
vlj
c353a60443
Glow: Use blit.
2014-04-19 23:20:12 +02:00
Daniel Butum
c7e9b87e90
Fix memory leak on early exit(0) in handleCmdLinePreliminary()
2014-04-19 20:44:30 +03:00
Vincent Lejeune
d7eaaf4885
Add a m_ubo_disabled switch in user config file.
...
This should be used to workaround a bug in intel windows drivers.
2014-04-19 18:38:57 +02:00
vlj
c695875654
PointLight: Use a 1/(1 + d + k d^2) attenuation
...
This is not physically accurate, but a 1/d^2 attenuation makes light
extend too broad, and went too high if close from the source.
2014-04-19 02:04:39 +02:00
Marianne Gagnon
f6d52511ea
Merge branch 'Issue_1263'
2014-04-18 18:24:31 -04:00
Marianne Gagnon
583d65d988
Update video settings dialog
2014-04-18 18:16:27 -04:00
Vincent Lejeune
c2d9e9fc42
Directly draw on default fbo if dyn lights are disabled
2014-04-18 19:06:57 +02:00
Vincent Lejeune
9437b16c00
Dont print glGetError result, prefer DEBUG_OUTPUT
2014-04-18 18:50:13 +02:00
Vincent Lejeune
b77a20f621
Bloom: Blit fbo instead of using a shader
2014-04-18 18:45:00 +02:00
Vincent Lejeune
9b926ce713
Do not write to 2 buffers outside of renderLights()
2014-04-18 18:34:02 +02:00
Guillaume P
cca44705cb
Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI
2014-04-18 08:49:54 +02:00
Guillaume P
43441cf3cc
A kart is now considered as slow if he is slower than the current kart.
2014-04-18 08:49:18 +02:00
hiker
c9fd09725a
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-17 15:40:36 +10:00
hiker
a8bf73633f
Renamed CurrentUser to OnlinePlayerProfile.
2014-04-17 15:39:51 +10:00
hiker
f6d22922d2
Fixed linux compilation.
2014-04-17 13:18:31 +10:00
hiker
22b599d257
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-17 12:11:33 +10:00
hiker
056aa5ed6f
Refactor so that PlayerProfile provides a proper interface plus
...
function/states for local use, and CurrentUser implements the
missing functions.
2014-04-17 08:19:04 +10:00
hiker
447ca89c0a
Removed CurrentUser usage from all files except PlayerManager
...
and PlayerProfile.
2014-04-16 11:13:35 +10:00
samuncle
5011f49968
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-16 01:20:23 +02:00
samuncle
1620f87dd8
Add a new particle system
2014-04-16 01:19:03 +02:00
Vincent Lejeune
1a908b254f
Use more compatible fbo format
2014-04-15 14:48:27 +02:00
hiker
46bfbe13bf
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-15 16:26:22 +10:00
hiker
5ec71c5b06
Moved getProfile from CurrentUser to PlayerManager::getCurrentOnlineProfile().
2014-04-15 16:25:55 +10:00
Marianne Gagnon
e4afea5cca
Reduce rimlight effect to a more reasonable strenght
2014-04-14 19:56:26 -04:00
Marianne Gagnon
70cb9cec59
Update graphics options screen
2014-04-14 19:32:44 -04:00
hiker
8b05f69031
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-15 09:08:04 +10:00
hiker
3b85f601b1
Support automatic online login even if current user is not saved
...
(i.e. online login is now started after the player is selected).
2014-04-15 09:07:13 +10:00
hiker
f33a9f7cf6
Fixed #1282 : STK crash on startup for the first time.
2014-04-15 09:06:50 +10:00
Marianne Gagnon
9993e31601
First pass to update video options menu
2014-04-14 19:05:33 -04:00
Marianne Gagnon
60a3cfb3fd
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-14 18:32:36 -04:00
Vincent Lejeune
ea1ba4147d
Try to fix additive blend for object
2014-04-14 23:50:12 +02:00
vlj
4c85f6255b
Remove the ability to disable pixel shaders
...
It doesn't work with GL 3.1 and mesa drivers (which requires a core
context)
2014-04-14 22:11:20 +02:00
vlj
b7f6084fba
Add a config option to disable dynamic lights
2014-04-14 22:06:24 +02:00
vlj
63db2d33c0
Fix a memleak
2014-04-14 21:50:14 +02:00
vlj
b0041633ee
Handle skybox texture compression.
2014-04-14 21:48:38 +02:00
vlj
de1bbad76c
Add some more graphic config options.
2014-04-14 21:46:51 +02:00
vlj
1d84ea850b
Add an option for Tex compression
...
Also turn m_ssao into bool.
2014-04-14 21:37:50 +02:00
vlj
308c9c3b94
Fix too dark screen with MLAA enabled.
2014-04-14 03:48:35 +02:00
Vincent Lejeune
5b47891514
Apply MLAA after color_in.
2014-04-14 03:30:42 +02:00
Vincent Lejeune
ba27eb42ef
Bloom: Weight the different sized contribution.
2014-04-14 02:45:15 +02:00
Vincent Lejeune
59df5a90bc
Bloom: Tweak the threshold.
2014-04-14 02:15:28 +02:00
Vincent Lejeune
d342dd78d8
Bloom: Use power of two quads.
2014-04-14 02:15:13 +02:00
Vincent Lejeune
123a192963
Use half res FBO for SSAO
...
SSAO is a medium frequency effect, using half res fbo is fine and
improve performance and look by doing an additionnal bilinear filtering.
Also tune up some values.
2014-04-14 01:01:36 +02:00
Vincent Lejeune
4c37cadd5f
Fix crash when loading instanced node without texture.
2014-04-13 22:56:14 +02:00
auriamg
4388f230a4
Merge pull request #1286 from marcoll/master
...
Avoid the use of the new GP editor as a cheating aid
2014-04-13 15:55:33 -04:00
Marc Coll Carrillo
82cc7af4f6
Avoid the use of the new GP editor as a cheating aid
2014-04-13 21:34:28 +02:00
Guillaume P
3febfecbef
Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI
2014-04-13 20:31:28 +02:00
Marianne Gagnon
99a50ec70c
misc little changes
2014-04-13 14:25:10 -04:00
Vincent Lejeune
f98ff2a5fc
Fix skid mark color
...
We convert the vertex color value to srgb, optimally the vertex color
should already be corrected on cpu side but it would break fallback
colors...
2014-04-13 18:00:15 +02:00
Vincent Lejeune
3cd85a829e
Compress/convert to srgb per material basis.
...
This allows to remove manual conversion in normalmap shader.
2014-04-13 17:53:52 +02:00
samuncle
1f14e26bde
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-13 01:01:59 +02:00
samuncle
04e5bb1239
Tweak the new camera
2014-04-13 01:01:24 +02:00
Vincent Lejeune
59c50ebbdd
Use ITexture instead of GLuint in GLMesh
2014-04-12 22:33:27 +02:00
Marianne Gagnon
a2d60cc97d
move camera closer to kart
2014-04-11 21:24:07 -04:00
vlj
d873d2d4fd
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-12 02:17:31 +02:00
vlj
3828e70f5a
Fix for glow effect
2014-04-12 02:15:02 +02:00
hiker
fcedb80a89
Fixed some compiler warnings.
2014-04-12 09:49:46 +10:00
hiker
b8c304b229
Merge branch 'SmoothMoveCamera' of https://github.com/divvy81/stk-code into smooth
2014-04-12 09:28:18 +10:00
Vincent Lejeune
68a71f6e22
Use for_in macro in stkmeshscenenode too.
2014-04-12 00:47:32 +02:00
Vincent Lejeune
849709ec1d
Revert some CPP2011 related changes.
2014-04-12 00:07:19 +02:00
vlj
443b758e20
Add shaders to MSVC target.
2014-04-11 20:56:23 +02:00
vlj
bc1776d0ff
Merge pull request #1281 from konstin/master
...
Fixing compilation issues on linux
2014-04-11 20:50:06 +02:00
konstin
9d22b74b54
Fixing compilation issues on linux
2014-04-11 20:14:20 +02:00
vlj
8775a5e006
Properly clean FBO and RTT.
2014-04-11 17:53:28 +02:00
hiker
71ddeda94f
Tried to avoid compilation problem on travis (though afaik there are
...
still other issues with building on travis atm), though atm only
by a quick hack.
2014-04-12 01:48:55 +10:00
Dk
d1dcf826a8
Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera
2014-04-11 17:48:16 +05:30
hiker
488c1231c9
Moved getUserState from CurrentUser to PlayerManager::getCurrentOnlineState().
2014-04-11 16:37:48 +10:00
hiker
3a5a0a56b2
Moved isRegisteredUser from CurrentUser into PlayerManager::isCurrentLoggedIn.
2014-04-11 16:20:04 +10:00
hiker
071aa01f35
Changed all calls to CurrentUser::getID() to PlayerManager::getCurrentOnlineId().
2014-04-11 16:06:51 +10:00
Marianne Gagnon
00e85b4637
Use PtrVector to get for_in iteration
2014-04-10 20:04:33 -04:00
vlj
a6abda9115
Yet another attemp to c++0x support in travisCI
2014-04-11 01:17:42 +02:00
vlj
ce9e9790d5
Improve VS generation in cmake.
2014-04-11 01:08:29 +02:00
vlj
0d90ecda16
Another attempt at fixing ci build.
2014-04-11 01:01:38 +02:00
vlj
4259d438b0
Use cmake file pattern tools
2014-04-11 00:57:16 +02:00
vlj
f58cf57768
Add gnu++11 flag to unix build.
2014-04-11 00:42:33 +02:00
vlj
09d13e2bfe
Try to fix travis ci build.
2014-04-11 00:37:50 +02:00
hiker
df88a013c2
Fixed more conflicts, removed compiler warnings.
2014-04-11 08:14:38 +10:00
hiker
54c7d67b90
Merge branch 'master' of github.com:supertuxkart/stk-code
...
Conflicts:
src/graphics/render.cpp
src/graphics/shaders.cpp
src/graphics/stkmesh.cpp
2014-04-11 08:08:13 +10:00
hiker
27a5959fcc
Added stack trace to LeakCheck on windows. Re-enabled stack
...
trace printing (though off as default).
2014-04-11 08:00:10 +10:00
Vincent Lejeune
cbc677febb
Merge branch 'BatchedDrawCalls'
2014-04-10 23:28:42 +02:00
vlj
42482e0c41
Some more conversion
2014-04-10 23:03:57 +02:00
vlj
3a55bbe796
Generalize use of UBO.
2014-04-10 21:16:44 +02:00
Vincent Lejeune
fee89a3a3e
Start decoupling tree based draw sequence.
2014-04-10 21:16:43 +02:00
Vincent Lejeune
55097aba91
Add shader file as comment for easier debug
2014-04-10 21:16:43 +02:00
Vincent Lejeune
9ba636f661
Gather View Projection and shadows matrix generation.
2014-04-10 21:16:42 +02:00
Guillaume P
76025ff784
It's even better with the key of the added repository.
2014-04-10 21:14:15 +02:00
Guillaume P
9a6eb2e34a
Clean up and re-enable notifications in travis config.
2014-04-10 21:14:15 +02:00
Guillaume P
9a386c0ee3
Update before_install section in travis config file.
2014-04-10 21:14:14 +02:00
Guillaume P
4586887bf2
Disable notifications.
2014-04-10 21:14:13 +02:00
hiker
8483f58f9d
Moved saved session data from UserConfig to PlayerProfile - which
...
means that now each player can individually save an online session.
2014-04-10 21:14:13 +02:00
hiker
a6f4f50281
Fixed documentation.
2014-04-10 21:14:12 +02:00
hiker
6a3698232e
Removed unused parameters.
2014-04-10 21:14:11 +02:00
hiker
ec213fbe28
Removed signedInAs function.
2014-04-10 21:14:11 +02:00
hiker
79edc5fa48
Made getCurrentUser() a static function.
2014-04-10 21:14:10 +02:00
hiker
1d71f8f1e1
Moved ServerJoinRequest from CurrentUser into RequestConnection
...
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
2014-04-10 21:14:09 +02:00
hiker
1299db94e6
Cosmetic changes only.
2014-04-10 21:14:08 +02:00
vlj
4cff5ce739
Merge pull request #1279 from gupascal/travis-update
...
Update travis config for mesa
2014-04-10 21:06:29 +02:00
Guillaume P
5dbd228b95
It's even better with the key of the added repository.
2014-04-10 08:50:45 +02:00
Guillaume P
0542a85204
Clean up and re-enable notifications in travis config.
2014-04-10 08:43:14 +02:00
hiker
502987d3e0
Now each PlayerProfile has a (currently still called) CurrentUser
...
which manages online connection data. Work-in-progress to use
only one object for all player data (instead of two atm: PlayerProfile
and CurrentUser).
2014-04-10 16:32:58 +10:00
Guillaume P
8f0ecee80c
Update before_install section in travis config file.
2014-04-10 08:15:29 +02:00
Guillaume P
b0c130017a
Disable notifications.
2014-04-10 08:02:51 +02:00
Dk
95b858a2d8
Merge branch 'SmoothMoveCamera' of https://github.com/divvy81/stk-code into SmoothMoveCamera
2014-04-10 07:07:32 +05:30
Dk
e0d22a28d6
Camera Moves Back Smoothly
2014-04-10 07:06:13 +05:30
Dk
ca1328eb3e
Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera
2014-04-10 06:34:21 +05:30
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
Dk
50ca35ca96
Rescue Camera is working properly
2014-04-09 22:30:05 +05:30
Dk
d25ea99665
Revert "Camera After Rescue comes to normal quickly"
...
This reverts commit 0345f26a7b .
git commit -m "revert"
2014-04-09 22:24:32 +05:30
Dk
9f4368da08
Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera
2014-04-09 21:06:49 +05:30
Dk
0345f26a7b
Camera After Rescue comes to normal quickly
2014-04-09 21:06:07 +05:30
hiker
481b5f22bb
Fixed compiler warnings.
2014-04-09 19:07:58 +10:00
hiker
5182cdb18b
Fixed line endings.
2014-04-09 19:07:44 +10:00
hiker
25c96d88ec
Moved saved session data from UserConfig to PlayerProfile - which
...
means that now each player can individually save an online session.
2014-04-09 08:33:42 +10:00
hiker
de697f26c8
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-09 08:28:01 +10:00
Vincent Lejeune
55489bc188
Use UBO instead of copying Shadow VP matrixes.
2014-04-08 21:45:04 +02:00
Vincent Lejeune
d67834574b
Remove some instance of setTransform.
2014-04-08 14:15:29 +02:00
Vincent Lejeune
4f92d9bc6b
Remove unused code.
2014-04-08 13:49:13 +02:00
Vincent Lejeune
f65b460f1c
Remove some reference to ETS_WORLD.
2014-04-08 13:49:11 +02:00
hiker
8c197a24b2
Fixed documentation.
2014-04-08 16:52:29 +10:00
hiker
c599359737
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-08 12:52:59 +10:00
vlj
62c6029e7a
Clean another line.
2014-04-08 02:05:55 +02:00
vlj
84488b192f
Another round at cleaning.
2014-04-08 02:02:08 +02:00
vlj
246d581e4c
Some cleaning.
2014-04-08 01:52:19 +02:00
hiker
384bdb1124
Removed unused parameters.
2014-04-08 08:19:14 +10:00
hiker
38051c0191
Removed signedInAs function.
2014-04-08 08:09:28 +10:00
hiker
43593d6312
Made getCurrentUser() a static function.
2014-04-08 08:06:52 +10:00
hiker
5956f2fdf7
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-08 08:00:51 +10:00
Vincent Lejeune
c5fd99a096
Clamp to edge when blurring fbo.
2014-04-07 22:38:20 +02:00
Vincent Lejeune
8fc3453eda
Fix instancied glossy map.
2014-04-07 22:29:06 +02:00
Vincent Lejeune
eb0dfb4530
Bigger light extend wrt energy.
2014-04-07 22:20:43 +02:00
Vincent Lejeune
939e574cd8
Make bloom effect more subtle.
2014-04-07 22:19:25 +02:00
vlj
e00ce85d7c
Support FresnelSchlick factor.
2014-04-07 21:35:10 +02:00
vlj
858c8c7605
Fix normalmap too
2014-04-07 21:35:10 +02:00
vlj
79c6424703
Use specularmap as glossiness map.
2014-04-07 21:35:09 +02:00
vlj
cafc07680a
Use Blinn Phong model.
2014-04-07 21:35:09 +02:00
Vincent Lejeune
0b318b9c7e
Improve quad's fit of pointlight extend
2014-04-07 21:04:03 +02:00
Vincent Lejeune
8aa5031fc0
FBO: Combined TMP1 and TMP2 should embed DS.
2014-04-07 17:47:49 +02:00
hiker
d88f513ad6
Moved ServerJoinRequest from CurrentUser into RequestConnection
...
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
2014-04-07 21:15:42 +10:00
hiker
cb8daa4977
Cosmetic changes only.
2014-04-07 16:52:09 +10:00
hiker
9b1b66689b
Moved achievement notification for server from CurrentUser to
...
Achievement.
2014-04-07 13:19:07 +10:00
Marianne Gagnon
569d68dfe1
Add asset to 'clearWindow' to catch invalid uses
2014-04-06 21:05:09 -04:00
Marianne Gagnon
06a3d770e5
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-06 20:57:37 -04:00
Marianne Gagnon
61ad56f088
Fix recovery dialog
2014-04-06 20:57:28 -04:00
gl3nn
8d3d65270a
Don't allow showing the notification dialog without using the dialog
...
queue anymore.
2014-04-07 02:12:45 +02:00
hiker
73e8fb3556
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-07 09:42:09 +10:00
vlj
3c3b076458
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-07 01:03:27 +02:00
vlj
ca2b5a7237
Fix normal map and srgb
2014-04-07 01:03:14 +02: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
hiker
cb959acb44
Added 'action' parameter to setUserDetail, and made it work when
...
the user is not logged in, so that it can be used for the recovery request.
2014-04-07 08:25:48 +10:00
hiker
6b7dcedc02
Don't log the value of 'current', 'new1' and 'new2' (which are used
...
when changing passwords).
2014-04-07 08:13:33 +10:00
vlj
dd51124680
Fix specular light buffer not written to.
2014-04-06 17:40:51 +02:00
Vincent Lejeune
ada1d2617c
Clear SSAO fbo at least once.
...
On intel driver (windows) texture swizzling seem not to work everytime
so use an untouched rtt instead of swizzling SSAO rtt if ssao is
disabled.
2014-04-05 21:21:01 +02:00
Vincent Lejeune
150ee87471
Use glFrameBufferTexture on shadows buffer
...
We're sure there is at least gl 3.2 support.
2014-04-05 20:53:38 +02:00
Vincent Lejeune
a951a8c885
Wrong glsl check when compressing textures.
2014-04-05 20:48:50 +02:00
Vincent Lejeune
04176d52a8
Do not create shadow vao for ctx < gl 3.2
2014-04-05 20:16:15 +02:00
Max Teufel
4f7bc981bd
Declare use of OpenGL 3.2 on OS X
2014-04-05 19:33:45 +02:00
Vincent Lejeune
012cf599b4
Use 2D version of glFramebufferTexture
...
glFramebufferTexture is not supported on GL 3.1 context, while
glFramebufferTexture2D is.
Also fix an inverted comparaison.
2014-04-05 19:22:03 +02:00
hiker
8e8f02a1dc
Bugfix: if the recovery dialog was shown and cancelled, no more mouse
...
events got sent to the LoginDialog. Seems to be the same problem that was
reported in #1216 , and properly fixed in
d954fc6c72 . Auria, can you check if this is correct?
2014-04-06 01:27:04 +11:00
hiker
0a107897ca
Moved user search and password change from CurrentUser into the
...
corresponding dialogs.
2014-04-06 01:25:31 +11:00
hiker
800a012283
Removed unnecessary copy of Addon.
2014-04-05 22:25:35 +11:00
hiker
a9ecf5b601
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-05 22:00:30 +11:00
hiker
4a3cf13bc4
Moved voting code from CurrentUser to VoteDialog.
2014-04-05 21:59:56 +11:00
Vincent Lejeune
2264f8e3a7
Disable srgb texture compression for Intel
...
RGB texture compression works fine but it looks like srgb TC isnt
properly supported.
A later TODO would be to convert rgb to srgb in cpu and use compression
again.
2014-04-05 03:13:45 +02:00
Dk
746e23c0f1
Camera even moved more closer
2014-04-05 06:39:42 +05:30
vlj
a57e81a37c
Use custom FBO instead of Irrlicht's ones.
...
This allows STK to use multisampled FBO.
2014-04-05 02:42:05 +02:00
Dk
4b6ea54704
Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera
2014-04-05 00:24:44 +05:30
Dk
ff2f3c0896
Camera while moving back is fixed
2014-04-05 00:24:07 +05:30
Vincent Lejeune
ca214230e3
MLAA: Load the right shader for step 2
...
No wonder why it didnt work as expected before...
2014-04-04 19:42:05 +02:00
hiker
85bd942de7
Removed unnecessary variable.
2014-04-04 21:00:22 +11:00
hiker
21f145b951
Moved requestGetAddonVote from CurrentUser into VoteDialog.
...
Some cosmetic only changes to VoteDialog to follow style guide.
2014-04-04 16:46:28 +11:00
hiker
34d79a8cd2
Fixed warning about modal dialog shown while previous dialog is open.
2014-04-04 16:44:55 +11:00
hiker
c663839d98
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-04 15:39:48 +11:00
hiker
59cbfbab6b
Fixed compiler warning.
2014-04-04 13:51:27 +11:00
hiker
6bf328e199
Try to fix clang compilation (note that std::swap does not work
...
on std::vector<bool>).
2014-04-04 13:50:35 +11:00
hiker
de694cc5fe
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-04 08:36:24 +11:00
hiker
dcba93aa7e
Moved canceling of friend requests into UserInfoDialog.
2014-04-04 08:15:48 +11:00
vlj
6a3556b4ba
Shaders'outputs use premultiplied alphas
2014-04-03 14:46:35 +02:00
vlj
8552ddae1c
MLAA: Fix gamma in the shaders.
...
MLAA looks correct now.
2014-04-03 14:15:51 +02:00
Dk
18335676e4
Smooth Move Camera
2014-04-03 16:35:11 +05:30
Dk
7e7e2a3394
Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera
2014-04-03 15:45:45 +05:30
Dk
a8f4ffac70
Camera Moves Smoothly
2014-04-03 15:37:44 +05:30
hiker
e8e4b7ad5f
Fixed unnecessary double precision computation.
2014-04-03 17:13:54 +11:00
hiker
af94314462
Merge branch 'crash-impulsion' of https://github.com/gupascal/stk-code into gupascal-crash-impulsion
2014-04-03 17:00:51 +11:00
hiker
d9267a937a
Moved 'removeFriendRequest' into UserInfoDialog.
2014-04-03 16:58:38 +11:00
Vincent Lejeune
afa2e2e98d
Use a A8R8G8B8 fbo to apply mlaa.
2014-04-03 00:55:30 +02:00
Vincent Lejeune
964d9a25f1
Some port fixes for MLAA
2014-04-03 00:27:46 +02:00
Vincent Lejeune
33b44c8c97
Port MLAA to new pipeline.
2014-04-03 00:14:58 +02:00
hiker
712d4cf84e
Updated documentation for Christmas mode.
2014-04-03 08:20:43 +11:00
Vincent Lejeune
26c797e79e
Fix kart shadows.
2014-04-02 00:09:49 +02:00
Vincent Lejeune
5573ee4e34
Follow more closely Crysis subsurface scatt.
2014-04-01 23:35:32 +02:00
Vincent Lejeune
f41b737913
Merge grass_pass*.vert
2014-04-01 23:16:30 +02:00
Vincent Lejeune
23e5ec709d
Add a fake subsurface scattering for grass.
2014-04-01 23:13:16 +02:00
vlj
0fb6515bca
Instancing: Support for alpha ref shadow.
2014-03-31 22:06:37 +02:00
vlj
52018bbdea
Instancing: Support shadow.
2014-03-31 21:52:42 +02:00
Vincent Lejeune
008e5e747a
GPUParticles: some factorisation.
2014-03-31 20:49:14 +02:00
Vincent Lejeune
27cccd6102
Fix sources.cmake
2014-03-31 20:12:02 +02:00
Vincent Lejeune
7ebeaa45e8
Some cleaning.
2014-03-31 20:04:34 +02:00
Vincent Lejeune
427ca42f49
Enable texture compression.
2014-03-31 19:44:11 +02:00
Vincent Lejeune
e034cd31a0
Fix context creation for intel.
2014-03-31 19:29:20 +02:00
Vincent Lejeune
551e6cc9c8
Add support for alpha ref instancied materials.
2014-03-31 19:16:26 +02:00
Vincent Lejeune
8c3c380ded
Actually enable scale.
2014-03-31 18:25:12 +02:00
Vincent Lejeune
bb311618e3
Instancing: Add support for scale transformation.
2014-03-31 18:10:45 +02:00
Vincent Lejeune
e1e791ff73
reenable diffuse env map
2014-03-31 17:33:30 +02:00
Vincent Lejeune
35f91e73ca
Merge branch 'properlinearpipeline'
...
* properlinearpipeline:
Disable auto exposure for now.
Using formula from an article suggested by samuncle
Improve bright attenuation although not perfect
Plug in brightness adaptation
Add some code to average log luminance.
Write a shader to convert CIE to RGB.
Factorize luminance computation.
Improve ao and bloom.
Remove some unused code
Fix negative value that introduces a bug on nvidia
Expand HDR use.
Convert texture from srgb and use srgb fbo
2014-03-31 17:26:08 +02:00
Vincent Lejeune
33f31dbf30
Disable auto exposure for now.
2014-03-31 17:25:04 +02:00
vlj
251e7f669e
Using formula from an article suggested by samuncle
2014-03-31 17:25:04 +02:00
vlj
af93a04987
Improve bright attenuation although not perfect
2014-03-31 17:25:03 +02:00
vlj
58615c0207
Plug in brightness adaptation
2014-03-31 17:25:03 +02:00
vlj
6e8b45a6d8
Add some code to average log luminance.
2014-03-31 17:25:02 +02:00
vlj
a2ab6fc80c
Write a shader to convert CIE to RGB.
2014-03-31 17:25:01 +02:00
Vincent Lejeune
881d0b9954
Factorize luminance computation.
2014-03-31 17:24:53 +02:00
vlj
8fc383206f
Improve ao and bloom.
2014-03-30 23:47:19 +02:00
vlj
77b289fed6
Remove some unused code
2014-03-30 23:38:18 +02:00
vlj
0dae1cf911
Fix negative value that introduces a bug on nvidia
2014-03-30 21:57:01 +02:00
vlj
6d3901f6a2
Clean skybox handling
2014-03-30 21:51:46 +02:00
Vincent Lejeune
1481a110a5
Use utils function for renderbloom/blend
2014-03-30 20:49:14 +02:00
vlj
bfdba01f2b
Expand HDR use.
2014-03-30 19:15:25 +02:00
vlj
10e2218b8c
Convert texture from srgb and use srgb fbo
2014-03-30 18:19:59 +02:00
Marianne Gagnon
9a5e3d9c9c
Try to handle case where addons XML file cannot be loaded
2014-03-30 11:48:38 -04: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
konstin
4d3e835021
re-adding -help
2014-03-30 16:19:09 +01: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
badf97dc77
whitespaces.py update 1
2014-03-29 11:32:50 +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
vlj
91c4e9de94
Fix orientations.
2014-03-29 02:19:08 +01:00
Marianne Gagnon
b7c07536f0
Merge branch 'Instancing'
2014-03-28 21:10:52 -04:00
Marianne Gagnon
d90c3753df
Pass absolute rotation, not relative rotation
2014-03-28 21:05:21 -04:00
vlj
1bac60c48a
Attempt to fix orientations.
2014-03-29 02:04:20 +01:00
vlj
f4eeb68fd4
Merge branch 'Instancing'
2014-03-29 01:22:57 +01:00
vlj
ca1a1e37d9
Fix normals for normal object.
2014-03-29 01:22:08 +01:00
Marianne Gagnon
fb90388e10
Apply patch by Marc Coll to improve upon his work on GP progress display
2014-03-28 19:16:56 -04:00
Marianne Gagnon
9406d69a72
Cleanup instancing nodes when cleaning track
2014-03-28 18:46:52 -04:00
konstin
fc2d55d6a5
Fixing #1263 and little bit refactoring
2014-03-28 22:10:43 +01:00
konstin
65e2dcf2f0
Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces
2014-03-28 20:08:39 +01:00
konstin
233f9947ff
Adding whitespaces.py, a small script for code clean
2014-03-28 20:08:02 +01:00
vlj
81b1e9fb94
Move the wind portion into the world matrix
...
It should make the normal correct although I didnt notice any visual difference.
2014-03-28 02:39:20 +01:00
vlj
35c8a14938
Forgot to clean some VAOs.
2014-03-28 01:55:10 +01:00
vlj
008b070aab
Properly clean GL buffers in instancing node.
2014-03-28 01:43:59 +01:00
vlj
c70b9ba0f8
Explicitly build the inverse matrix
...
Some drivers does not support inverse function although they advertise
glsl 140 support, and it's faster to do it manually as we know the
structure of the matrix.
2014-03-27 19:12:55 +01:00
vlj
3538fd46d2
Look like instance orientation was wrong.
2014-03-27 01:33:02 +01:00
vlj
b384716cc4
getWind() changes.
2014-03-27 01:25:04 +01:00
Marianne Gagnon
348a20288f
Apply patch by Marc Coll to have better progress reports during long GPs, thanks!
2014-03-26 20:14:29 -04:00
Vincent Lejeune
1740407e1e
Use GS instancing to speed up shadow gen a little.
2014-03-26 22:27:11 +01:00
Vincent Lejeune
b9d0088ff9
Parse more context in windows build.
2014-03-26 22:13:02 +01:00
Vincent Lejeune
14500d65ab
Reverse order of templates in glwrapp.hpp
2014-03-26 21:18:36 +01:00
Vincent Lejeune
f49dfbc51f
Fix flip particle shader.
2014-03-26 20:58:13 +01:00
Vincent Lejeune
0f451c8f9d
List files when shader link fails.
2014-03-26 20:49:58 +01:00
Vincent Lejeune
9f0620c122
Add a #define to switch between dof and non dof
2014-03-26 19:42:25 +01:00
vlj
8b652ababb
Merge object_pass*.vert
2014-03-26 19:04:46 +01:00
vlj
ae5c7b8c3d
Implement UI single color overload
2014-03-26 19:04:45 +01:00
Guillaume P
c04ee0f345
When a kart has crashed, make the impulsive force a little more realistic. (depending on the kart velocity).
2014-03-25 16:59:20 +01:00
vlj
71881ac64d
Add orientation to grass material
2014-03-25 16:49:03 +01:00
hiker
24dc70427f
Fixed compiler warnings.
2014-03-25 20:54:20 +11:00
Vincent Lejeune
9fef40318e
Fixes for grass instancied material.
2014-03-25 00:09:32 +01:00
Vincent Lejeune
72556fddc3
Don't use glDebugMessageCallbackARB if null
2014-03-24 21:47:24 +01:00
vlj
a866b3f416
Add Grass material support for instancing.
2014-03-24 16:40:40 +01:00
Sachith Hasaranga Seneviratne
7232e6c11e
Scripts can now squash karts by id and for a defined period of time
2014-03-24 11:32:46 +05:30
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
f9cdb05751
Revert "Revert "Removed unnecessary comment""
...
This reverts commit e967e9a1f9 .
2014-03-24 11:12:04 +05:30
Sachith Hasaranga Seneviratne
e967e9a1f9
Revert "Removed unnecessary comment"
...
This reverts commit 954e963d1a .
2014-03-24 11:10:43 +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
vlj
3423cbf60b
Some fixes.
2014-03-23 20:05:51 +01:00
Vincent Lejeune
76cf04f548
Clean code to make it extendable later
2014-03-23 19:50:33 +01:00
Vincent Lejeune
5c8ef365a5
Merge instanced_object_pass vertex shaders.
2014-03-23 19:28:07 +01: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
vlj
73755a3431
clamp overload was ambiguous.
2014-03-23 01:09:14 +01:00
samuncle
f7f3cb1cbe
Add depth of field to the color_level shader. As vincent requested. Something cleaner need to be done
2014-03-23 00:59:06 +01:00
Marianne Gagnon
5750b860c9
Add missing icon
2014-03-22 19:49:48 -04:00
Marianne Gagnon
ce1cbd44da
Use new single-color overload in font where possible
2014-03-22 19:38:48 -04:00
vlj
a21d162d5a
Add an overload for draw2DImage with a single color
2014-03-23 00:29:47 +01:00
vlj
6fc2248d7a
GPUParticles: some factorisation
2014-03-23 00:19:57 +01:00
vlj
9752689d15
Do not render billboard outside of transparent pass
2014-03-22 23:18:07 +01:00
vlj
c0b2b23692
Factorise cubevbo/vao in shader.cpp
2014-03-22 23:09:33 +01:00
vlj
6538d16eb3
Fix a shader compile failure on nvidia.
2014-03-22 22:32:52 +01:00
vlj
fd82494ee8
Add file path when a compiler error arise.
2014-03-22 22:32:01 +01:00
Vincent Lejeune
2cbf8dafc7
SkyShader: attrib position is not always 0.
2014-03-22 20:05:56 +01:00
Vincent Lejeune
efa7316fc5
Definitively fix stencil bug thx to graphitemaster from irc
2014-03-22 19:19:59 +01:00
Vincent Lejeune
29749d5dbd
Merge commit 'f3e2da881a4d394c4ca902548e788f5b4c0bdd81'
...
* commit 'f3e2da881a4d394c4ca902548e788f5b4c0bdd81':
Do not build shadow shader without gs support.
Add a function to query supported glsl ver
Some drivers dont support const array
2014-03-22 18:54:51 +01:00
Vincent Lejeune
f3e2da881a
Do not build shadow shader without gs support.
2014-03-22 18:36:21 +01:00
Vincent Lejeune
ae3cf30070
Add a function to query supported glsl ver
2014-03-22 18:36:20 +01:00
Vincent Lejeune
aa39246404
Some drivers dont support const array
2014-03-22 18:36:19 +01:00
Unitraxx
c647fa5081
Merge pull request #1252 from mcsab/master
...
Reset-per-lap achievement support
2014-03-22 01:12:28 +01:00
Csaba Molnar
ca19a428b2
merge, comment fix, never-consistence fix
2014-03-22 01:02:52 +01:00
Vincent Lejeune
320558c205
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-03-22 00:52:53 +01:00
Csaba Molnar
3a5812dd6c
Merge branch 'master' of https://github.com/supertuxkart/stk-code
...
Conflicts:
data/achievements.xml
2014-03-22 00:52:33 +01:00
Vincent Lejeune
1f1e79477d
Add missing utils/log.hpp in glwrap.hpp
2014-03-22 00:24:00 +01:00
Marianne Gagnon
33b3880320
Add the author of the GP editor to the credits
2014-03-21 18:56:47 -04:00
Vincent Lejeune
340eaa9352
Factorize getLightFactor
2014-03-21 18:36:47 +01:00
Vincent Lejeune
01b88fde9d
Factorize DecodeNormal from misc shaders.
2014-03-21 18:17:21 +01:00
Vincent Lejeune
77e5f413c7
Factorize EncodeNormal from Pass1 shaders.
2014-03-21 18:10:54 +01:00
Vincent Lejeune
f0e96bb7f2
Use variadic function to load shader
2014-03-21 18:09:10 +01:00
Vincent Lejeune
9728226ee3
Forgot to dereference a value.
2014-03-21 15:58:21 +01:00
Guillaume P
0faa3b2eac
Don't fire a cake if the target kart is driving too slow.
2014-03-21 14:36:31 +01:00
Guillaume P
c857bbaec0
Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI
2014-03-21 14:05:42 +01:00
Sachith Hasaranga Seneviratne
954e963d1a
Removed unnecessary comment
2014-03-21 15:40:08 +05:30
Sachith Hasaranga Seneviratne
4dd0d4c0bb
Added better Message
2014-03-21 15:36:59 +05:30
Sachith Hasaranga Seneviratne
c1b8927b31
Cleaned up a bit
2014-03-21 15:31:28 +05:30
Marianne Gagnon
89e070c7f3
Revert dubious change from GP patch
2014-03-20 21:30:10 -04: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
vlj
68935decaa
Reenable Debug Output on windows.
2014-03-21 01:44:14 +01:00
vlj
a35b7d1e2d
Do not reload Caustic/displace texture each frame
2014-03-21 01:43:45 +01:00
auriamg
dee2a0300e
Merge pull request #1259 from cosmincav/master
...
Added achievement: unstoppable
2014-03-20 20:08:43 -04:00
vlj
f06ad3c785
Reenable transparent + fog material.
2014-03-20 18:25:44 +01:00
vlj
b3f59437b1
Fix rubber band effect for plunger.
2014-03-20 18:06:59 +01:00
cosmin.crecana
8616ce546a
achievement_unstoppable
2014-03-20 15:30:11 +02:00
Sachith Hasaranga Seneviratne
4334d9a022
Added haybail.as
2014-03-20 15:05:33 +05:30
vlj
a3eee305ca
Remove the max distance for lights
2014-03-19 23:07:40 +01:00
vlj
822081deb4
Only reupload buffer for skidding mark
2014-03-19 23:00:45 +01:00
Vincent Lejeune
4128371b7f
Do not switch program if it's not used.
2014-03-19 19:02:29 +01:00
Vincent Lejeune
782e280bfc
Factorize PointLightShader vao and vbo.
2014-03-19 18:42:48 +01:00
Arthur-D
9c3d854a2a
Merge pull request #1257 from matthiaskrgr/patch-1
...
travis: revert all changes done to notification section
2014-03-19 03:17:52 +01:00
Matthias Krüger
04f635d9cb
travis: revert all changes done to notification section
2014-03-19 02:33:58 +01:00
Vincent Lejeune
1e8bc6bc41
Try to avoid updating skidmark each frames.
2014-03-19 01:54:07 +01:00
Arthur-D
5a77c2082a
Merge pull request #1256 from matthiaskrgr/patch-1
...
travis: rm unneeded deps, don't build via script
2014-03-19 01:40:46 +01:00
Matthias Krüger
15f0445ce3
travis: rm unneeded deps, don't build via script
2014-03-19 01:38:27 +01:00
Vincent Lejeune
9a6d15a865
Attempt to fix skidding mark's color
2014-03-19 01:25:54 +01:00
Arthur-D
d9c5d415cd
Merge pull request #1255 from matthiaskrgr/patch-1
...
travis: remove some useless options, condense irc message, skip joins in...
2014-03-19 01:20:53 +01:00
Vincent Lejeune
433903be5d
Reenable skidmark, although their color is wrong
2014-03-19 01:07:32 +01:00
Matthias Krüger
66d2404243
travis: remove some useless options, condense irc message, skip joins in channel
2014-03-19 00:57:50 +01:00
auriamg
37ee2d73b3
Merge pull request #1254 from nathan-osman/bluetooth-check
...
Check for libbluetooth on Unix platforms.
2014-03-18 19:37:00 -04:00
Marianne Gagnon
9042a4e0f2
Fix bogus merge, sorry
2014-03-18 19:26:36 -04:00
Marianne Gagnon
4948f5acb2
Merge branch 'master' of https://github.com/sudip1401/stk-code
...
Conflicts:
data/achievements.xml
src/achievements/achievement_info.hpp
2014-03-18 19:16:43 -04:00
Vincent Lejeune
dd5997d277
Start working on instancing library node
2014-03-18 23:47:53 +01:00
Vincent Lejeune
4af050e1c0
Bring back minimap.
2014-03-18 23:47:40 +01:00
Csaba Molnar
83ae6909b5
Tab fix
2014-03-18 23:47:40 +01:00
Csaba Molnar
571b3a8e34
Wrong include corrected (\ -> /).
...
Drift counting fixed.
2014-03-18 23:47:39 +01:00
Csaba Molnar
806da15a12
Skidding achievement
2014-03-18 23:47:38 +01:00
hiker
506b64b587
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-18 21:18:30 +11:00
hiker
2173ae8280
Try to work around the currently reported build problem by travis.
2014-03-18 21:17:40 +11:00
sudip1401
0bca25504a
Poweruplover achievement
2014-03-18 13:18:50 +05:30
hiker
03b1994041
Merge branch 'master' of https://github.com/konstin/stk-code into konstin-master
2014-03-18 16:22:59 +11:00
hiker
0f4fb50fd6
Merge branch 'master' of https://github.com/KroArtem/stk-code into KroArtem-master
2014-03-18 16:15:14 +11:00
Nathan Osman
6b8f12b1b5
Check for libbluetooth on Unix platforms.
2014-03-17 19:02:53 -07:00
hiker
cd7e9ff8a9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-18 10:47:53 +11:00
hiker
3d5fbaa92f
Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master
...
Fixed some merging issues.
Conflicts:
data/achievements.xml
src/achievements/achievement_info.hpp
2014-03-18 10:44:11 +11:00
Marianne Gagnon
3d6fd8e792
Add patch to mention firing back in tutorial
2014-03-17 18:52:36 -04:00
Csaba Molnar
249635f01a
onLapEnd() fix
2014-03-17 22:30:17 +01:00
Csaba Molnar
e8eabc80c9
Fixing achievement description
2014-03-17 22:26:53 +01:00
Csaba Molnar
60f1d8ae20
Achievement reset-after-lap beta
2014-03-17 22:07:55 +01:00
sudip1401
72920ab0ab
Poweruplover achievement
2014-03-18 02:20:51 +05:30
hiker
e9367dd1c9
Fixed potential crash if RelationInfo should not exist, which I saw
...
once while a decline was in progress), started some minor refactoring.
2014-03-18 07:48:52 +11:00
sudip1401
89d7663112
Poweruplover achievement
2014-03-18 02:04:01 +05:30
KroArtem
4dec9c3fc5
having fun reverting changes
2014-03-17 23:56:49 +04:00
konstin
de50ea46e8
Allow karts to specifie a different sound effect for their engine; closes #1234
2014-03-17 17:01:34 +01: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
Guillaume P
45ab7e6907
Clean up some minor coding style issues
2014-03-17 08:21:49 +01:00
Guillaume P
3f35a48dda
Now IA don't fire a cake if the kart is driving too slow. Also correct some comments.
2014-03-17 08:14:35 +01:00
Guillaume P
b4fe033331
Revert "Now IA don't fire a cake if the kart is driving too slow. Also correct some comments."
...
This reverts commit 9030291340 .
2014-03-17 08:10:21 +01:00
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
KroArtem
66c5d4a645
removed unused functions
2014-03-16 15:28:46 +04:00
Sachith Hasaranga Seneviratne
c8e0d56ce9
Added Build target for AngelScript, Updated Readme,txt
2014-03-16 16:50:14 +05:30
Sachith Hasaranga Seneviratne
7e4cf23ee3
Removed unnecessary projectfiles
2014-03-16 16:36:18 +05:30
Sachith Hasaranga Seneviratne
df67597ec7
added AS library
2014-03-16 14:44:05 +05:30
Sachith Hasaranga Seneviratne
5b9e214b83
Added additional instructions to readme.txt
2014-03-16 13:01:19 +05:30
Sachith Hasaranga Seneviratne
686dd6c335
Updated new files with the script
2014-03-16 12:44:12 +05:30
Sachith Hasaranga Seneviratne
f1a4df7127
Added stuff to track object presentation
2014-03-16 12:26:35 +05:30
pgabor
f84f49dfc8
Adding a Wiimote with other one alredy placed - Bug: #1209 fixed
2014-03-15 21:15:04 +01:00
KroArtem
d4e90f83f2
revert unique_ptr back to auto_ptr
2014-03-15 23:30:15 +04:00
Vincent Lejeune
ce12ebe9ce
Bring back minimap.
2014-03-15 20:05:04 +01:00
auriamg
847ceca671
Merge pull request #1243 from mcsab/master
...
Skidding achievement
2014-03-15 15:01:41 -04:00
Csaba Molnar
c175f2450e
Tab fix
2014-03-15 19:58:25 +01:00
Marianne Gagnon
037688b020
Fix terminal warning flood, and improve error detection. Thanks to vlj for help
2014-03-15 14:39:27 -04:00
Csaba Molnar
bc3850ebdb
Wrong include corrected (\ -> /).
...
Drift counting fixed.
2014-03-15 19:18:03 +01:00
Vincent Lejeune
1b4863d7aa
Add asserts before binding vao and fix 0 glow vao
2014-03-15 18:59:22 +01:00
Marianne Gagnon
0425cf2ef4
Implement color variation in particle system
2014-03-15 13:35:51 -04:00
Guillaume P
5af377da07
Fix a build issue for Travis CI.
2014-03-15 15:58:17 +01:00
KroArtem
a3a851b300
Merge remote-tracking branch 'upstream/master'
2014-03-15 18:30:17 +04:00
Guillaume P
8a34be1ab3
Add a new Gold Driver achievement.
2014-03-15 15:12:28 +01:00
Guillaume P
9030291340
Now IA don't fire a cake if the kart is driving too slow. Also correct some comments.
2014-03-15 10:52:01 +01:00
Sachith Hasaranga Seneviratne
acbfb96bbf
Added script files
2014-03-15 10:55:03 +05:30
Sachith Hasaranga Seneviratne
2fe031d24d
Added CmakeLists entry and comments to point to where to switch between linux and windows
2014-03-15 10:52:15 +05:30
hiker
de820054b6
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-15 11:55:28 +11:00
hiker
3f738b60d5
Fixed crash in UserInfoDialog if an invalid response is received (friend id
...
is not contained in the response --> profile not found --> crash. Now
the friend id is stored in the request itself, and not needed in the response
from the server). Moved RejectFriendRequest into UserInfoDialog.
2014-03-15 11:54:04 +11:00
Csaba Molnar
385f108b16
Skidding achievement
2014-03-15 00:38:16 +01:00
Marianne Gagnon
3fb98fe85f
Work around crash in render code. Vlj, please review this, this is likely not the proper fix
2014-03-14 19:35:35 -04:00
hiker
aa169d0191
Moved AcceptFriendRequest into UserInfoDialog.
2014-03-15 10:27:13 +11:00
hiker
f76536ca31
Moved FriendRequest into corresponding GUI object.
2014-03-15 10:13:44 +11:00
hiker
e63ad2754d
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-15 09:48:14 +11:00
hiker
e77287d3ce
Moved signup request from CurrentUser to register screen.
2014-03-15 09:34:23 +11:00
KroArtem
ccd6019f48
Merge remote-tracking branch 'upstream/master'
2014-03-15 01:15:48 +04:00
Vincent Lejeune
5e03e461bc
Revert to compatibility context for linux build.
2014-03-14 17:04:44 +01:00
Vincent Lejeune
cb344520ef
Merge branch 'BatchedDrawCalls'
2014-03-14 16:57:18 +01:00
Vincent Lejeune
0c5d5ce96e
IBL: Fix sampling ignoring cubemap rotation
2014-03-14 16:51:07 +01:00
Vincent Lejeune
740c251808
Use Instancing for lights.
2014-03-14 16:51:06 +01:00
Vincent Lejeune
6cad7339e3
Factorize texture binding.
2014-03-14 16:51:05 +01:00
Vincent Lejeune
cf2035ca0a
Batch draw calls
2014-03-14 16:51:05 +01:00
hiker
c0a70830c2
Moved ServerCreationRequest from CurrentUser into the server creation screen.
2014-03-14 22:18:02 +11:00
hiker
6afc12c866
Moved recovery request into recovery dialog. Fixed recovery dialog to
...
work now (except the URL sent from the server is still wrong).
2014-03-14 16:44:58 +11:00
Rakesh Ranjan Nayak
9b50c9f8bd
merged code with upstream master
2014-03-13 22:47:06 +05:30
Rakesh Ranjan Nayak
59e0e3c9be
added an achievement banana lover
2014-03-13 22:33:20 +05:30
Rakesh Ranjan Nayak
8f55faeed3
added achievement banana lover
2014-03-13 22:28:52 +05:30
hiker
7e1a59fe99
Mark fulfilled achievements in blue.
2014-03-13 17:18:28 +11:00
hiker
cecb725228
Display correct results for achieved achievements.
2014-03-13 17:12:51 +11:00
hiker
a5f9d26f88
Fixed display of achievements when not logged in.
2014-03-13 08:31:06 +11:00
Guillaume P
955b27bf75
Add a Marathoner achievement.
2014-03-12 14:15:16 +01:00
hiker
4eb4ce1511
Bugfix: onRaceEnd was not called for achievements (resulting in
...
achievements not being reset at end of a race).
2014-03-12 22:40:43 +11:00
hiker
be9d7292f2
Replaced template function to simplify setting online request data with
...
function (since template doesn't compile on linux without -std=gnu++0x or so).
2014-03-11 17:13:37 +11:00
hiker
642797bdde
Cosmetic changes to follow our coding style. Also fixed incorrect
...
'waiting for friends' message while waiting for achievements.
2014-03-11 17:03:07 +11:00
auriamg
14424ee10f
Merge pull request #1238 from gupascal/master
...
Fix a compilation issue with VS10.
2014-03-09 19:54:07 -04:00
Vincent Lejeune
e9e60339bf
Fix non compiling shader on mesa
2014-03-09 21:06:02 +01:00
Guillaume P
16cff9097b
Fix a compilation issue with VS10.
2014-03-09 10:10:34 +01:00
auriamg
6c3a5375d7
Merge pull request #1235 from GiedriusS/master
...
Fixed a typo in TODO.md
2014-03-08 19:16:30 -05:00
auriamg
112c46fa14
Merge pull request #1236 from divvy81/downstream
...
Change of color player kart when any player quits
2014-03-08 19:11:14 -05:00
Marianne Gagnon
56a8fe8fbe
Some cleanup in particles. Make 'scale affector' behavior uniform between GPU particles and fallback irrlicht particles
2014-03-08 19:02:42 -05:00
Dk
b4d922512e
1195 Multiplayer Kart selection screen commit 22
2014-03-08 21:08:06 +05:30
Giedrius Statkevičius
8968c3b510
Fixed a typo in TODO.md
2014-03-08 16:13:31 +02:00
hiker
796d43ebb2
For now avoid the use of the template, since it doesn't work on linux.
2014-03-08 12:24:44 +11:00
hiker
0146a1265c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-08 11:49:33 +11:00
hiker
56b53cc3c0
Another try to fix linux compilation.
2014-03-08 11:49:18 +11:00
hiker
841d360b93
Fixed one problem with linux compilation.
2014-03-08 11:38:07 +11:00
hiker
51f3a6d555
Added static template function to CurrentUser to create html requests,
...
which will prefill the HTML request with the details of the current user.
So far used only in online_profile.
2014-03-08 10:29:40 +11:00
hiker
809cb27d89
Fixed crash when clicking on empty achievement list.
2014-03-07 16:35:13 +11:00
hiker
f86646abb9
Fixed crash (when clicking on empty friend list).
2014-03-07 16:33:07 +11:00
hiker
3c1a7b1c7b
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-07 16:05:17 +11:00
hiker
c8749a3400
Fixed unnecessary include.
2014-03-07 16:04:59 +11:00
hiker
1ccac0db7c
Fix #1232 (GP causes crash).
2014-03-07 16:04:10 +11:00
Marianne Gagnon
10caa7a2ec
Post-merge tidying up
2014-03-06 19:19:39 -05:00
auriamg
780201b1ad
Merge pull request #1226 from konstin/master
...
Solving Issue 1180 - Load addon GPs from local folder
2014-03-06 19:12:29 -05:00
hiker
58c325e6c3
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-07 11:02:53 +11:00
hiker
7cb7651c07
Renamed Profile to OnlineProfile to better distinguish the various profiles we use.
2014-03-07 11:02:07 +11:00
Vincent Lejeune
cbd7453f7b
Do not crash if old shaders dont compile
2014-03-07 00:03:26 +01:00
hiker
d19b5a2732
Fxed support for searching for data and assets based on the executable location.
2014-03-07 07:53:35 +11:00
konstin
f7953f4f12
Adding debug messages for 1180
2014-03-06 20:30:52 +01:00
Dk
52e910a438
1195 Multiplayer kart selection commit 21
2014-03-06 23:39:33 +05:30
Dk
7c8a32a10e
1195 MUltiplayer kart selection cmmit 21
2014-03-06 23:31:34 +05:30
abhishek1995
96fe29eb84
Update CMakeLists.txt
2014-03-06 21:13:53 +05:30
abhishek1995
62869dc92f
Update CMakeLists.txt
...
This commit includes checking whether ../data directory (from build directory) and ../../stk-assets directory (from build directory) exists or not. If they don't exist, then it gives error message for the corresponding directory. I have included the code for this on line 320.
2014-03-06 20:51:09 +05:30
konstin
9ddd5a2d5c
reducing the pull request to it's content
2014-03-06 11:58:09 +01:00
konstin
baa56f3254
Merge remote-tracking branch 'upstream/master'
2014-03-06 11:45:19 +01:00
konstin
b561f440ba
1180 Loading Grand Prix's from locale directory
2014-03-06 11:30:51 +01:00
hiker
0208dbaf8a
Fixed #38 , fixed #1230 (which is a duplicate).
2014-03-06 17:11:22 +11:00
hiker
58a5928b17
Fixed #1228 (crash when no default player is set and -N, -R, ... is used).
2014-03-06 17:06:41 +11:00
auriamg
605e4c6dff
Merge pull request #1218 from divvy81/downstream
...
1195 Multiplayer kart selection
2014-03-05 18:04:03 -05:00
hiker
b0018d4e5f
Removed unnecessary variable.
2014-03-06 08:49:30 +11:00
hiker
352863a763
Handled case that friends are not in cache when looking at the friend list
...
(which can happen when you look at friends of friends, your own friends
are persistent).
2014-03-06 08:21:54 +11:00
hiker
ebc2299150
Added more comments, code style cleanup only.
2014-03-06 08:04:43 +11:00
hiker
6450c569ac
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-06 07:44:18 +11:00
hiker
b80e9217f5
Fix camera tilting (some debug left-over broke it).
2014-03-06 07:43:51 +11:00
Dk
796c8b823a
1195 Multiplayer karts selection screen commit 20
2014-03-06 00:18:12 +05:30
Dk
7d87d79d20
1195 Multiplayer Kart Selection commit 19
2014-03-05 23:22:41 +05:30
Dk
c5d23f7154
1195 Multiplayer kart selection commit 18
2014-03-05 23:02:23 +05:30
Dk
de7d0aa995
Merge remote-tracking branch 'multiplayer/downstream' into downstream
2014-03-05 21:39:20 +05:30
Dk
eddc512b16
1195 Multiplayer kar selection screen commit 17
2014-03-05 21:37:07 +05:30
divvy81
6f98d1d371
Update Ocean.stkskin
2014-03-05 21:15:04 +05:30
Dk
b5feb9740a
1195 Multiplayer kart selection commit 16
2014-03-05 21:08:17 +05:30
Dk
0e17d39f1a
1195 Multiplayer kart selection commit 15
2014-03-05 20:47:05 +05:30
Dk
1dab0daeb5
1995 Multiplayer kart selection screen commit 14
2014-03-05 20:16:48 +05:30
konstin
c09a3172f1
Solving Issue 1180 - Load addon GPs from local folder
2014-03-05 12:11:20 +01:00
hiker
eba8fd1e45
Remove passwords and tokens from Log:: output.
2014-03-05 10:34:28 +11:00
Vincent Lejeune
8600d3bc61
IBL: Spheremap now reflects skybox
2014-03-04 23:37:45 +01:00
Vincent Lejeune
391053e368
IBL: Implement IBL
2014-03-04 23:28:24 +01:00
hiker
02fa3ceed0
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-05 08:42:39 +11:00
Vincent Lejeune
718c1cacb0
Improved caustics effect.
2014-03-04 22:30:33 +01:00
hiker
586641120c
Fixed crash in online user search (triggered when pressing ESC while the
...
search is being executed).
2014-03-05 08:21:19 +11:00
Vincent Lejeune
8f127be9de
Fix caustic shader not picking caustic.png
2014-03-04 22:08:34 +01:00
Vincent Lejeune
ada5928aa2
Forgot a hunk
2014-03-04 18:47:10 +01:00
Vincent Lejeune
c93c921028
STKMesh: Support caustic material.
2014-03-04 18:42:33 +01:00
Vincent Lejeune
ada19f828c
Fix black glowing objects.
2014-03-04 17:52:23 +01:00
hiker
f549b729df
Remove camera tilting in flying mode.
2014-03-04 16:56:03 +11:00
hiker
3e478265bc
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-04 14:12:11 +11:00
Marianne Gagnon
a063d23b37
Fix intro cutscene
2014-03-03 18:57:10 -05:00
Vincent Lejeune
e1d879a1f2
STKMesh: Improve displace effect.
2014-03-03 23:59:12 +01:00
Vincent Lejeune
4ac634bb11
Fix motion blur edge.
2014-03-03 23:58:37 +01:00
hiker
46304e7f28
Removed m_fake_search, resorted functions to be in a more logical order,
...
added comments.
2014-03-04 08:15:46 +11:00
Dk
72346ee101
1195 Multiplayer kart select commit 13
2014-03-04 00:16:35 +05:30
Dk
99a19ee739
multiplayer kart selection commit 12
2014-03-03 23:53:15 +05:30
Dk
14467e320b
1195 Multiplayer kart selection screen
2014-03-03 23:32:43 +05:30
samuncle
7393fa0603
Add an attenuation based on depth
2014-03-03 16:38:26 +01:00
samuncle
ee76d9b579
Reduce the brightness of the vignette
2014-03-03 15:19:22 +01:00
samuncle
4b92ee1716
Add a vignette to simulate a real camera
2014-03-03 14:12:56 +01:00
hiker
7592200a44
Added more comments.
2014-03-03 21:55:46 +11:00
hiker
4fd6d29462
Removed debug code.
2014-03-03 16:37:54 +11:00
hiker
c1afacfc38
Added support for limited resizing of the online profile cache
...
if too many search results are found. Print warning (instead of
assert) to console if search results should be missing (because of
cache eviction).
2014-03-03 16:32:05 +11:00
hiker
7cdc064640
Fixed replay using the --ghost command line option.
2014-03-03 13:14:56 +11:00
hiker
f1ecf999b2
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-03 10:03:02 +11:00
hiker
38bdca2038
Fixed typo.
2014-03-03 09:17:45 +11:00
hiker
32d26f8855
Ignore doxygen output files in src/html.
2014-03-03 08:00:53 +11:00
Vincent Lejeune
9f83b1ab76
Remove unneeded varying in sky.frag.
2014-03-02 17:50:42 +01:00
Vincent Lejeune
da4896c3d8
SSAO: tweak fade distance.
2014-03-01 22:50:22 +01:00
hiker
0ec7542175
Added more comments.
2014-03-01 17:16:23 +11:00
hiker
e79a46ef38
Fixed crash when --track or --kart is used and no default player exists.
...
Also only print an error message if --track or --kart do not work (e.g.
the track/kart is not unlocked, or no default player exists) instead of
aborting STK.
2014-03-01 17:14:56 +11:00
Marianne Gagnon
d954fc6c72
Better fix for player info dialog
2014-02-28 19:54:18 -05:00
hiker
937533dbdb
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-01 11:35:46 +11:00
hiker
d1e02a6870
Removed commented out code.
2014-03-01 11:34:48 +11:00
hiker
9f6d6949f6
Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim
2014-03-01 11:31:32 +11:00
Dimitrije Jankov
c8cba7df07
Fixes the player_info_dialog not loading...
2014-03-01 01:11:25 +01:00
Marianne Gagnon
093ac337d1
Fix GP info dialog
2014-02-28 18:28:42 -05:00
hiker
7e9682bde6
Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim
2014-03-01 09:47:59 +11:00
Dk
33a5dbacfd
1195 multiplayer Kart selection
2014-03-01 00:05:24 +05:30
Dk
84cc9dd972
1195 Multiplayer kart selection
2014-03-01 00:01:32 +05:30
Vincent Lejeune
168780a3ac
Clean some code.
2014-02-28 17:56:45 +01:00
Vincent Lejeune
baba5f79d1
Remove some unused shaders.
2014-02-28 17:30:25 +01:00
Vincent Lejeune
af862cb6c5
#version autoadded to shaders and turn some v120
2014-02-28 17:29:05 +01:00
Dimitrije Jankov
a354648497
Fix for
...
Author: hikerstk
Atm the user config.xml file is in UTF (since previously it stored the
name of players which requires special characters). The player
information is now stored in a separate file, so the config.xml can be
written as ascii now (avoiding problems some people have that they can't
see or edit the file)
2014-02-28 15:32:38 +01:00
hiker
1903aee114
Changed lower and upper bound (at lower speed less speed should be
...
lost), capped speed fraction. Tweaked parachutes parameters somewhat.
2014-02-28 23:57:49 +11:00
Dk
15faf7dbee
1195-Multiplayer kart selection
2014-02-28 16:51:27 +05:30
Bart Cools
c131312b33
Implemented the possibility to give yourself "negative" attachments (parachutes, anvils, bombs) to be able to playtest more efficiently
2014-02-28 11:10:35 +01:00
Bart Cools
89a336ff9a
Tweaked the logic of parachutes to be more modifiable. There now is an upper bound percentage and lower bound percentage which will be applied if you are driving faster and slower respectively. Also added those values in stk_config.xml to make playtesting easier (ticket #1135 )
2014-02-28 11:10:25 +01:00
Dimitrije Jankov
9fc0d5be77
This fixes the issues my patch has caused...
...
1) if I start without existing user config files, it crashes (current
player is NULL)
2) the m_remember_me variable is not used
3) if I understand the code correctly, it sets the current player to a
guest player to indicate that there is no current player atm (which is
then used to start the login window). If this correct, then it would be
better to indicate this by setting the current player to NULL. Reason is
that this way we can easily detect incorrect usage elsewhere (since we
will get a crash, instead of storing data in the guest player, and we
will only later detect that something was not saved as expected).
2014-02-28 10:23:09 +01:00
hiker
14d6e6ae7e
Added missing initialisation of m_is_default.
2014-02-28 19:01:40 +11:00
Dimitrije Jankov
d0f93d3b98
Fixed the skiping of the lobby screen :)
2014-02-28 02:36:53 +01:00
Dimitrije Jankov
2ef991e9e7
Removed the m_default_player from the user_config.hpp because the
...
default user is loaded from the players.xml file
2014-02-28 00:38:35 +01:00
hiker
0ddeb3b434
More documentation, and usage of typedef instead of std::vector<...>.
2014-02-28 09:19:10 +11:00
hiker
bef02c116c
Bugfix: addPersistent/addToCache would call Profile::merge(), which
...
deletes the original profile --> the profile accessed after this call
was invalid.
2014-02-28 08:51:02 +11:00
hiker
76787599d9
Moved some class declarations into functions. Added comments.
2014-02-28 08:48:07 +11:00
hiker
db0c75b988
Make sure that the used bit of a profile is always set when updating
...
the cache bits (even though it probably doesn't matter, but that's
hard to understand, this way is cleaner).
2014-02-28 08:12:03 +11:00
hiker
efdb78f012
Added comments, sorted some functions so that all cache functions
...
are next to each other etc. No actual code change.
2014-02-27 16:55:32 +11:00
hiker
a686c43dd8
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-27 15:36:51 +11:00
hiker
42b72cc2a8
Added comments, minor code changes only.
2014-02-27 15:29:30 +11:00
Marianne Gagnon
a5eba8bf83
remove leftover floating ribbon in giftbox model
2014-02-26 19:50:19 -05:00
Vincent Lejeune
108e82afc2
Fix Sara's moving textures.
2014-02-27 01:49:03 +01:00
Vincent Lejeune
9941b18d7f
Rework moving textures support.
2014-02-27 01:22:34 +01:00
hiker
d734d310ab
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-27 09:36:11 +11:00
Vincent Lejeune
7532ea1768
Skybox: Do some cleaning.
2014-02-26 22:28:06 +01:00
Vincent Lejeune
9ffa4681d3
Better when actually include the shaders.
2014-02-26 21:53:29 +01:00
Vincent Lejeune
61ea376ff2
Use cubemap for skyboxes
2014-02-26 19:08:24 +01:00
hiker
1c6d63acc7
Added separate create() function for ProfileManager, and some cosmetic changes.
2014-02-26 16:34:46 +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
04fe9b6329
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-26 12:07:51 +11:00
hiker
2916e3e351
Removed typedef (which is a work around for certain mesa versions)
...
from windows and osx.
2014-02-26 12:06:59 +11:00
Marianne Gagnon
2a8476305d
Fix uninitialized variable
2014-02-25 20:06:02 -05:00
hiker
96a0c599d1
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-26 11:55:38 +11:00
hiker
b68b57676f
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-26 11:14:06 +11:00
Marianne Gagnon
196cbdee09
Fix bogus error level
2014-02-25 19:14:51 -05:00
hiker
244d00280c
Applied patch from jpirie for fixing mesa 10 compilation problems.
2014-02-26 11:13:03 +11:00
Vincent Lejeune
c4a38b413f
Remove cullface disable in ref tested texture.
2014-02-26 00:43:29 +01:00
hiker
36c9c4d6c3
Fix the display of achievement progress: avoid that a value can be
...
larger than the goal value (otherwise after racing one track 12 times
the progress for Christoffel would should 12/10).
2014-02-26 10:36:02 +11:00
Marianne Gagnon
e1830b4e8a
Replace printf with log
2014-02-25 18:31:43 -05:00
hiker
0b33474f2f
For now disable shader by default, to avoid people not being able to
...
run stk at all (#1212 ).
2014-02-26 10:24:09 +11:00
Vincent Lejeune
6e6667a2ea
Check minor gl version
2014-02-26 00:00:50 +01:00
hiker
4139d145cf
Create a default user config file if no user config file exists.
...
This is for now useful for crash problems (e.g. to disable shaders).
2014-02-26 09:41:38 +11:00
hiker
ac2619007f
Fixed translation.
2014-02-26 09:16:40 +11:00
hiker
c6288af326
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-26 08:40:51 +11:00
hiker
b17d2ca0e2
Started to add support for offline achievement viewings (still not
...
fully working).
2014-02-26 08:19:24 +11:00
hiker
7644a5960f
Fixed bug (instance variables were access after the object was deleted);
...
addded code to show the achievement screen.
2014-02-26 08:17:49 +11:00
hiker
6cce1199e9
Fixed typo in new achievement (attribute must be named goal).
2014-02-26 07:41:06 +11:00
Vincent Lejeune
65c0750525
Clean some unneeded code and fix ssao viz.
2014-02-25 19:01:35 +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
Marianne Gagnon
6eaa1e6db8
Fix crash in tracks without skybox
2014-02-23 19:35:30 -05:00
Marianne Gagnon
317f147406
Fix normals in item boxes and bananas
2014-02-23 19:05:09 -05:00
hiker
71f61f71c6
Fixed compilation errors - no idea why VS compiled it ok previously :(
2014-02-24 08:26:51 +11:00
hiker
4f266639aa
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-24 08:22:55 +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
Vincent Lejeune
2d1acf5353
Godray: improve the effect and its stability.
2014-02-23 20:16:03 +01:00
Vincent Lejeune
04fc4c3be7
Reenable Godray (on all track atm)
2014-02-23 20:02:15 +01:00
Vincent Lejeune
778cdcf3ce
Godray/Godfade now declared in new pipeline.
2014-02-23 18:59:24 +01:00
KroArtem
30977b7913
Merge remote-tracking branch 'upstream/master'
2014-02-23 19:41:00 +04:00
Vincent Lejeune
a00abffb01
MotionBlur: Use direct GL calls.
2014-02-23 00:13:22 +01:00
Vincent Lejeune
58ef59dcd9
Split stkmesh into mesh and actual scene node
2014-02-22 23:31:27 +01:00
hiker
b4099b5354
Made the story mode xml file format more compact by saving only the
...
highest level at which a challenge was solved (lower levels will
automatically be marked as solved).
2014-02-22 11:44:21 +11:00
KroArtem
d2179e960d
#1156 , fix quotes in CMakeLists files, see http://cmake.org/Wiki/CMake/Language_Syntax#Quoting for more info
2014-02-21 23:09:10 +04:00
KroArtem
08fcb42e7b
Merge remote-tracking branch 'upstream/master'
2014-02-21 20:59:41 +04:00
hiker
90343ff276
Fixed missing initialisation of m_reset_after_race, and added
...
error message in case of missing achievement data.
2014-02-21 23:39:14 +11:00
hiker
b214799a35
Some refactoring in he Achievement classes, code style cleanup.
2014-02-21 22:15:36 +11:00
hiker
8307e0d8a3
Fixed memory leak.
2014-02-21 16:54:52 +11:00
hiker
1921dbdacd
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-21 13:38:55 +11:00
Vincent Lejeune
1325fa7940
Fix UI clipping.
2014-02-20 18:43:51 +01:00
Vincent Lejeune
8ba0fcb8e0
STKMesh: Transparent texture can move now.
2014-02-20 18:31:00 +01:00
hiker
8f36220b61
Renamed AchievementsSlot to AchievementsStatus.
2014-02-20 23:03:25 +11:00
hiker
700953f295
Removed unnecessary save function.
2014-02-20 22:37:27 +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
Vincent Lejeune
40c4155bd2
STKMesh: Support for (non ref) moving texture
2014-02-20 00:01:02 +01:00
hiker
55665e21a3
Removed some compiler warnings.
2014-02-20 08:55:35 +11:00
hiker
b0b9712fb9
Removed friend relation between StoryModeStatus and UnlockManager.
2014-02-20 08:44:57 +11:00
samuncle
e3f85ba41b
Tweak the cam tilt
2014-02-17 23:47:07 +01:00
hiker
ceecec0fa0
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-18 08:52:19 +11:00
hiker
fb1c73718a
Try to remove shaking of camera somewhat.
2014-02-18 08:51:03 +11:00
samuncle
4a5f09dca3
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-02-17 22:37:23 +01:00
samuncle
073a049389
Correction of a syntax error
2014-02-17 22:36:00 +01:00
hiker
23301d822a
Experimentally adjust camera up vector depending on kart roll, which means
...
the camera will now follow the gravity changes.
2014-02-18 08:18:33 +11:00
hiker
a34d47d72a
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-18 07:53:30 +11:00
hiker
8cd1e2e491
Renamed the node name in the player.xml file to better describe what
...
it is, removed unused variable.
2014-02-18 07:38:44 +11:00
Vincent Lejeune
e5a174d85b
Add compatibility keyword on and remove some unused shaders
2014-02-17 15:34:57 +01: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
1f7028f997
Ignore all bld* directories.
2014-02-17 20:12:15 +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
6685966616
Fixed flying.
2014-02-17 17:00:11 +11:00
hiker
2595d31eba
Implemented crude work around for drivers that do not support
...
opengl 3.3.
2014-02-17 16:52:40 +11:00
hiker
9ec80210af
Added simple script that makes all challenges trivial
...
(0 laps, no time or energy limit).
2014-02-17 11:50:13 +11:00
hiker
b313c680fc
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-17 11:44:09 +11:00
Marianne Gagnon
8c187f6e5a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-02-16 19:06:03 -05:00
Marianne Gagnon
148ab7deb3
Improve profiler to CSV export
2014-02-16 19:05:30 -05:00
Joerg
721439748c
Merge pull request #44 from lurk26/patch-1
...
Update README.md
2014-02-17 11:04:18 +11:00
hiker
753e5199b9
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-17 10:58:11 +11:00
hiker
c84264a44e
Fixed linux compilation bug.
2014-02-17 10:57:40 +11:00
Marianne Gagnon
8763b95603
Merge branch 'master' of https://github.com/supertuxkart/stk-code
...
Conflicts:
src/utils/profiler.cpp
2014-02-16 18:11:17 -05:00
Marianne Gagnon
1e8c2ff523
Use plain ofstream to write profiler CSV
2014-02-16 18:10:29 -05:00
Joerg
90095882ee
Merge pull request #46 from hiker/new_login
...
Merged into our master.
2014-02-17 10:06:37 +11:00
Marianne Gagnon
289505d909
Add missing profiler
2014-02-16 17:42:06 -05:00
hiker
7a1670bc8a
Merge branch 'master' of github.com:supertuxkart/stk-code into new_login
...
Conflicts:
src/utils/profiler.cpp
2014-02-17 09:41:55 +11:00
hiker
a3f3613e1e
Merge branch 'hiker/new_login'
2014-02-17 08:23:48 +11:00
hiker
8cccc72b9a
Fixed merge from upstream.
2014-02-17 07:48:18 +11:00
hiker
10db4d6c2c
Removed unused variable.
2014-02-17 07:47:01 +11:00
lurk26
c322579248
Update README.md
...
Updated compiling instructions for Windows.
2014-02-16 18:29:30 +05:30
hiker
7b993cd210
Fixed VS compilation.
2014-02-16 21:31:41 +11:00
hiker
c2b4f42c93
Merge remote-tracking branch 'upstream/master' into new_login
2014-02-16 15:11:50 +11:00
KroArtem
12a9b92af0
replace auto_ptr by unique_ptr as auto_ptr is deprecated
2014-02-16 00:32:40 +04:00
Vincent Lejeune
d5d57bbae0
Shadows: Softer edge and smoother cascade transitions
2014-02-15 20:45:47 +01:00
Marianne Gagnon
fd8496ffba
Fix linux/gcc compilation
2014-02-13 18:57:51 -05:00
Marianne Gagnon
8227e1c092
Add first rudimentary way to dump profiler measurements to CSV. More work to do!
2014-02-12 21:06:12 -05:00
auriamg
0e722b30a3
Merge pull request #41 from sachith500/bug1118
...
Bugfix for 1118
2014-02-12 18:33:50 -05:00
Vincent Lejeune
57079cbff5
Shaders: Declare penumbraH/V and shadowgen
2014-02-12 23:32:18 +01:00
Vincent Lejeune
3d3333905d
Some factorization.
2014-02-12 22:41:32 +01:00
Vincent Lejeune
0243546e4d
Use an openGL 3.3 compatibility context when available.
2014-02-12 22:16:10 +01:00
Vincent Lejeune
3d61056b81
Revert "STKMesh: Force readonly materials."
...
This reverts commit 8c5a5b9b20 .
2014-02-12 18:46:28 +01:00
Vincent Lejeune
8c5a5b9b20
STKMesh: Force readonly materials.
...
We never changed materials on the fly but better safe than sorry.
2014-02-12 18:31:21 +01:00
Vincent Lejeune
bff2208947
Remove rain effect.
...
Rain enabled map crashes with non glsl codepath, and having a particle
effect handled separatly from others effect made it unmaintainable.
Rain must be implemented using gfx file with eventually a custom
property.
2014-02-12 17:51:18 +01:00
Vincent Lejeune
0cf6e4266a
Graphics: Clean some dead code.
...
Still leave some shadow related code as comment, I will need later to
port cand's work on penumbra shadow.
2014-02-12 17:51:17 +01:00
Sachith Hasaranga Seneviratne
56656b581d
Bugfix for 1118
...
Hide countdown as soon as race ends to prevent the drawGlobalTimer() method in race_gui from checking for failed challenges.
https://sourceforge.net/apps/trac/supertuxkart/ticket/1118
Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com >
2014-02-12 22:04:21 +05:30
Vincent Lejeune
70f89a8bce
Shadow: Use 4 cascades.
...
Now that we use GS and textures array it's easier to add a cascade.
4 is still not optimal but I'd like to avoid cascade count inflation as
much as possible ; 4 x 1024x1024 has the bandwidth requirement of the
single 2048x2048 shadowmaps we previously had.
2014-02-11 21:49:46 +01:00
Vincent Lejeune
934d1f10b8
Shadow: Use Geometry Shader for better perfs.
...
The 3 cascades are now rendered in a single pass, using 2D array texture and
a GS to do the dispatch ("layered rendering").
It's possible to use instancing instead but it requires the AMD_vertex_shader_layer
extension which is oddly part of opengl 4.2.
2014-02-11 21:07:44 +01:00
hiker
07a5d90aa0
Merge remote-tracking branch 'upstream/master' into new_login
2014-02-11 22:36:13 +11:00
hiker
ff585e4c73
Automatically compute active challenges when changing the current player.
2014-02-11 22:35:23 +11:00
hiker
7bba1ae478
Fixed saving first-time use of the story mode.
2014-02-11 22:28:41 +11:00
hiker
5b50f64310
Ignore emacs backup files (*~).
2014-02-11 13:41:16 +11:00
auriamg
b060b7651a
Merge pull request #37 from KroArtem/master
...
Fix coverity issues (memleaks, copy-paste error)
2014-02-10 19:23:45 -05:00
hiker
7b45db42e7
Removed debug print.
2014-02-11 10:13:23 +11:00
hiker
2fe21fc3b2
Added operator<<(const bool&), to get proper true/false written
...
instead of 0/1 - but it doesn't work yet :(
2014-02-11 09:52:46 +11:00
hiker
83bc8c83e6
Fixed empty user config.xml files.
2014-02-11 08:54:44 +11:00
hiker
810c536d43
Fixed various minor bugs.
2014-02-11 08:12:10 +11:00
hiker
0228b82ef4
Fixed incomplete merge.
2014-02-11 07:41:35 +11:00
Vincent Lejeune
da6e6daeaa
Create a BO with texture_2d_array for shadows.
2014-02-10 19:01:24 +01:00
Vincent Lejeune
c8844486fa
Shadow: Tweak bias
2014-02-10 15:58:09 +01:00
Vincent Lejeune
515bcbc750
Shadow: very crude csm support
2014-02-10 15:42:17 +01:00
Vincent Lejeune
ad2dcff431
Revert "Fixed running on hd3000 (8192 was too big for my system, not sure"
...
This reverts commit 748dcf1e15 .
2014-02-10 15:39:52 +01:00
hiker
8fc76729f9
Merge remote-tracking branch 'upstream/master' into new_login
2014-02-10 21:37:40 +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
748dcf1e15
Fixed running on hd3000 (8192 was too big for my system, not sure
...
what values should be used best, I used the previous code here).
2014-02-10 21:35:13 +11:00
hiker
230e1789f2
Made sorting of players descending (instead of using > in operator<),
...
removed kart and unique id from game slot, replaced some forgotten calls to
unlock_manager with calls to PlayerManager.
2014-02-10 17:00:16 +11:00
hiker
16521fce5a
Removed loading and saving of challenge.xml file.
2014-02-10 15:28:13 +11:00
Vincent Lejeune
4fd130b2ac
Shadow: Grass now cast shadows.
2014-02-09 23:24:01 +01:00
hiker
8d1591b260
Removed all references to current user/slot from unlock manager.
2014-02-10 08:57:16 +11:00
Vincent Lejeune
18896ff95e
Shadow: Support for alpha tested meshes.
2014-02-09 22:56:50 +01:00
hiker
5acf3e1681
Various compilation fixes, some cosmetic changes.
2014-02-10 08:41:54 +11:00
Vincent Lejeune
19d490a26d
Lights: Remove unused export value.
2014-02-09 21:18:15 +01:00
Vincent Lejeune
1c510881a7
Shadow: Fix broken specular with shadows enabled.
2014-02-09 21:16:16 +01:00
Vincent Lejeune
5d5ac34648
Shadow: soften edge a little
2014-02-09 20:03:54 +01:00
Vincent Lejeune
63db565fd7
Shadow: Better bias.
2014-02-09 19:42:22 +01:00
Vincent Lejeune
f0ef8e9913
Shadow: reenable shadows
...
It's just plain basic shadowmaps, a lot of tweak is still necessary but
it gives a way to see how light values are affected in some places.
(cave in chocolate for instance)
2014-02-09 19:20:55 +01:00
KroArtem
dfe267e9ec
Merge remote-tracking branch 'upstream/master'
2014-02-09 17:23:47 +04:00
KroArtem
33ea1a6ef5
fix coverity issues
2014-02-09 17:04:15 +04:00
hiker
97be85777d
Started to move current player info from unlock manager into
...
player_manager.
2014-02-09 23:22:45 +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
49d14e5046
copy-paste error
2014-02-09 01:50:02 +04:00
KroArtem
c4fd2eda08
fixing some memleaks
2014-02-09 01:36:32 +04:00
Vincent Lejeune
ab05cb45b8
Shaders: Remove some unused shaders.
2014-02-08 18:19:16 +01:00
auriamg
3fdae349b2
Merge pull request #36 from KroArtem/master
...
Clean src/modes and src/karts from old logging code
2014-02-07 18:36:54 -05:00
KroArtem
1861c6533a
small fix: mismatching allocation/deallocation
2014-02-08 01:21:39 +04:00
KroArtem
fde38a35af
clean src/addons
2014-02-07 16:45:38 +04:00
KroArtem
591e421b10
clean src/io
2014-02-07 16:23:46 +04:00
KroArtem
746c1ddf5d
clean src/items
2014-02-07 15:38:20 +04:00
KroArtem
c0b13b01ff
clean src/modes from printf/cout/cerr
2014-02-07 02:17:49 +04:00
hiker
3fee08d743
Merge branch 'new_login' of github.com:hiker/stk-code into new_login
2014-02-06 23:09:49 +11:00
hiker
045bfeaf13
Removed m_all_players from UserConfigParams (though there are stil
...
bugs in the new code).
2014-02-06 23:08:55 +11:00
hiker
dd860f46f9
Fixed linux compilation.
2014-02-06 15:56:41 +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
KroArtem
a61ee58a39
clean src/karts from cout, printf and cerr
2014-02-06 01:26:30 +04:00
Vincent Lejeune
653a695eda
Fix fog looking weird on transparent.
...
But mixing alpha with 0 instead of 1.
2014-02-05 15:07:57 +01:00
Vincent Lejeune
62964430a6
Unset AF when not requested
...
AF was never unset thus making it enabled everywhere even when there was
a 1:1 fragment/texel mapping.
This makes a significant performance boost when AF is enabled.
2014-02-05 15:07:18 +01:00
auriamg
7d0216c110
Merge pull request #32 from KroArtem/master
...
Get rid of printf/cout in kart_selection.cpp, cppcheck fixes
2014-02-04 16:10:37 -08:00
hiker
62d46b7ec0
Renamed XMLWriter to UTFWriter (which is the correcter name).
2014-02-05 08:22:38 +11:00
KroArtem
ca4bfa525e
revert changes in race_manager.hpp
2014-02-04 04:38:52 +04:00
KroArtem
ddbc2299b7
Merge remote-tracking branch 'upstream/master'
2014-02-04 03:50:08 +04:00
KroArtem
a7b2490be6
cppcheck fixes
2014-02-04 03:43:44 +04:00
KroArtem
2772fafcf0
cppcheck fixes, use logging in kart_selection.cpp
2014-02-04 02:53:50 +04:00
Vincent Lejeune
19c9cd217f
Reenable Anisotropic Filtering
2014-02-03 20:30:40 +01:00
Vincent Lejeune
1d6df18b0a
Remove 2 extras printf in shaders.cpp
2014-02-03 20:15:20 +01:00
Vincent Lejeune
5964809f3c
Forget to add transparentfog.frag shader.
2014-02-03 20:14:12 +01:00
Vincent Lejeune
8a341dc800
Add a transparent fog aware shader
2014-02-03 20:04:01 +01:00
Vincent Lejeune
6e93178d68
Fog: Do not use camposition in the shader.
2014-02-03 20:04:00 +01:00
Deve
57b38b4371
Partially fixed #1067 .
...
beforeAddingWidget() wasn't accounting for the extra space required for the random track.
This was causing the ribbon widget in soccer mode to get drawn incorrectly.
I also changed it in easter egg and tracks screen.
Thanks to sachith500.
2014-02-03 19:29:27 +01:00
Deve
35941194bb
If challenges in overworld are GPs, they now indicate so. Thanks to sachith500.
2014-02-03 18:25:36 +01:00
hiker
4d3ba6509e
Added first script to find unused files in STK.
2014-02-03 14:31:08 +11:00
KroArtem
e0a6ec717e
cppcheck: unused functions
2014-02-03 00:53:18 +04: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
deb6883a67
Graphics: try to fix some coverity reported issues.
2014-02-02 21:05:57 +01:00
Vincent Lejeune
9595884354
Fix linux build
2014-02-02 20:52:18 +01:00
Vincent Lejeune
541edc76a0
Shaders:Clean some dead code
2014-02-02 20:41:39 +01:00
Vincent Lejeune
cd43ee3c9d
Lightprepass: Remove now useless lightblend shader.
2014-02-02 20:18:05 +01:00
gl3nn
06b7ba09f5
Bool to string fix for challenges. String to bool applied for
...
achievements.
2014-02-02 15:50:10 +01:00
Deve
9b2b6c1c78
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-02-02 10:54:40 +01:00
Deve
57d0975c50
Avoid some code duplication. Thanks to sachith500.
2014-02-02 10:53:33 +01:00
Vincent Lejeune
fbc47dd6ca
Do not use GL_PACK_INVERT_MESA when screenshooting
...
Oddly enough it is reported as FeatureAvailable in Windows.
This fixes the screenshot bug.
2014-02-02 02:56:10 +01:00
Vincent Lejeune
2bb1254fa4
Fix bloom shader
2014-02-02 02:13:04 +01:00
Vincent Lejeune
afd5d1917c
Fix Opengl pre 3.0 context creation.
2014-02-02 01:03:01 +01:00
Vincent Lejeune
19fd67995d
Use system's glext.h/glxext.h on linux.
2014-02-02 00:47:27 +01:00
Marianne Gagnon
b726ff79b1
Fix bug found by coverity scan. Hopefully I didn't break anything
2014-02-01 18:36:29 -05:00
auriamg
aa324f31e6
Merge pull request #25 from KroArtem/master
...
more coverity fixes, get rid of printf in device_manager.cpp
2014-02-01 15:20:43 -08:00
hiker
b6112997b5
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-01 23:23:33 +11:00
Deve
1aa4be85f3
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-02-01 12:25:56 +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
samuncle
a27b946755
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-02-01 04:19:59 +01:00
samuncle
c9a54b99d9
Use the small font to display FPS in order to reduce the size of the debug view
2014-02-01 04:15:26 +01:00
KroArtem
8f69e0b043
fix compilation
2014-02-01 04:21:55 +04:00
KroArtem
8a731691fd
more coverity fixes, get rid of printf
2014-02-01 03:54:34 +04:00
Arthur-D
842bc33b13
Merge pull request #24 from maxanton/TravisBadge
...
Add travis-ci badge to README.md
2014-01-31 10:17:45 -08:00
Max Teufel
069b560350
Add newline after travis-ci badge
2014-01-31 18:00:24 +01:00
Max Teufel
bb6a15abed
Add travis-ci badge to README.md
2014-01-31 17:57:17 +01:00
hiker
ab5d40ce59
Ignore README.dependencies and bld* directories.
2014-01-31 16:25:49 +11:00
hiker
2a66d53e8f
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-01-31 15:47:07 +11: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
30fdf82436
Adding Tomreyn's travis build files - this time to master ;)
2014-01-31 15:22:52 +11:00
hiker
5e8c8f2715
Fixed linux compilation.
2014-01-31 11:31:26 +11:00
Marianne Gagnon
a38a3b1b9a
Try to fix compilation
2014-01-30 19:14:19 -05:00
auriamg
316b24d087
Merge pull request #22 from sachith500/bug1056
...
Fixed bug #1056 Addons search last updated option text is cropped
2014-01-30 16:00:55 -08:00
hiker
9ef4885db6
Merge branch 'gravity_from_normal'
2014-01-31 08:36:28 +11:00
Sachith Hasaranga Seneviratne
fa72b7716e
Fixed bug #1056 Addons search last updated option text is cropped
...
changed addons_screen.stkgui to ensure the filterdate spinner had adequate space.
Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com >
2014-01-30 12:56:54 +05:30
hiker
fe04a73849
Disable upright constraint when having changed gravity.
2014-01-30 17:19:57 +11:00
hiker
9db2d405ef
Removed hardcoded 'up' direction for the raycast for terrain detection.
2014-01-30 17:08:39 +11:00
hiker
8313bcb0d2
Trigger rescue only when the kart is not on gravity terrain.
2014-01-30 12:29:05 +11:00
hiker
c80a78dcf2
Made some pointers const.
2014-01-30 12:27:12 +11:00
Marianne Gagnon
8156b8a66b
Rewrite bizarre code in a way that makes more sense
2014-01-29 19:45:56 -05:00
Marianne Gagnon
87f5fd988e
Don't use raw char*, use std::string instead. Fixes leaks.
2014-01-29 19:39:38 -05:00
Marianne Gagnon
3e253be31e
Misc code improvements
2014-01-29 19:20:57 -05:00
Marianne Gagnon
b7e7808500
Fix failed override attempt
2014-01-29 19:08:17 -05:00
auriamg
d57710b717
Merge pull request #18 from sachith500/bug1056
...
addons_screen minor fix
2014-01-29 15:31:57 -08:00
KroArtem
b80548a46e
fix some coverity issues
2014-01-30 03:19:41 +04:00
Artem
6025db77c3
Merge pull request #1 from supertuxkart/master
...
merge
2014-01-29 14:08:19 -08:00
Sachith Hasaranga Seneviratne
0811d13d18
addons_screen minor fix
...
2 weeks = 14 days not 12
Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com >
2014-01-29 23:27:04 +05:30
hiker
199b747ef0
Fixed some compiler warnings.
2014-01-29 22:04:18 +11:00
hiker
e775d8eb98
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-01-29 15:14:42 +11:00
hiker
2479000137
Minor cleanup: renamed resetAllKarts back to unloadAllKarts (to avoid
...
confusion since resetAllKarts in world is called before a race),
and removed unused function.
2014-01-29 15:09:28 +11:00
Vincent Lejeune
e93cfd8b8e
Also factorize particles related state changes.
2014-01-29 02:18:19 +01:00
Vincent Lejeune
a9258500b8
Factorize displace and glow state changes.
2014-01-29 02:08:52 +01:00
Vincent Lejeune
4c7ba19642
This shouldnt be there
2014-01-29 01:57:56 +01:00
Vincent Lejeune
5ae0d2f4dc
Factorize solid state changes.
2014-01-29 01:57:55 +01:00
Vincent Lejeune
c6e466fdcc
Factorise transparent state changes.
2014-01-29 01:57:55 +01:00
Vincent Lejeune
57808f0815
Disable water, bgnodes and textbillboards.
2014-01-29 01:57:34 +01:00
Vincent Lejeune
8b46454859
Add an assertion
2014-01-29 01:35:43 +01:00
Vincent Lejeune
1fa0a9e9cc
Display unhandled materials in debug mode
2014-01-29 01:35:43 +01:00
Vincent Lejeune
c994ed720d
Fix a typo
2014-01-29 01:33:07 +01:00
Vincent Lejeune
e9d995504d
Fix normal maps
2014-01-29 01:21:53 +01:00
auriamg
35405e43b8
Merge pull request #15 from sachith500/master
...
Ticket #1149 - clarify story mode for players.
2014-01-28 15:01:48 -08:00
Vincent Lejeune
098303dced
GPUParticles: Use transparent_effect pass
2014-01-28 21:40:53 +01:00
Vincent Lejeune
5be8dbedab
Increase buffer size in displayfps
2014-01-28 21:35:12 +01:00
Vincent Lejeune
fd968a0acf
OGL32CTX: Factorize UI shaders
...
This should fix UI disappearing after resolution change.
2014-01-28 21:26:16 +01:00
Vincent Lejeune
9955aa6970
STKMeshes: Support for transparent_add_color mat
2014-01-28 20:12:56 +01:00
Vincent Lejeune
143e3a355d
Display rendered objects count instead of ktris.
...
Things go well untill we have more than 200 objects on my system, no
matter how big they are.
2014-01-28 20:05:16 +01:00
Sachith Hasaranga Seneviratne
e50c902bf2
Ticket #1149
...
Message in story mode now additionally points players to the minimap.
Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com >
2014-01-28 21:51:46 +05:30
hiker
9192557cd4
Merge branch 'resoCrashFix' of https://github.com/KristofDM/stk-code into KristofDM-resoCrashFix
2014-01-28 22:00:32 +11:00
hiker
1709ccc36d
Started to set the gravity for selected material based on the
...
normal of the triangle where the kart is on.
2014-01-28 21:42:23 +11:00
Marianne Gagnon
f1f8900c5d
Add a couple profiler markers
2014-01-27 18:59:53 -05:00
Vincent Lejeune
f50e6f817d
Use another normal encoding method from a crytek slide.
2014-01-27 23:29:46 +01:00
Vincent Lejeune
1c98cf0b61
Normalize normals when they are used to get more precision
2014-01-27 22:31:01 +01:00
Vincent Lejeune
5771dd98c7
Fix typo
2014-01-27 22:31:01 +01:00
Deve
a65d538b05
Upload patch from ubuntu backports for supertuxkart.desktop file
...
and add polish translation.
2014-01-27 21:52:05 +01:00
Vincent Lejeune
d642bc1489
Lightprepass: Only store normals in rtt
...
Use a more economical rtt format.
2014-01-27 21:47:25 +01:00
Vincent Lejeune
0bbba17e5e
STKBillboard: Fix a typo
2014-01-27 20:33:56 +01:00
Vincent Lejeune
22ccf3bab3
GPUParticle: Use depthbuffer
2014-01-27 20:33:21 +01:00
Vincent Lejeune
dbcf60003b
SunLight: Use DepthBuffer
2014-01-27 20:25:45 +01:00
Vincent Lejeune
ecac127dd6
Fog: Use depthbuffer.
2014-01-27 20:25:19 +01:00
Vincent Lejeune
bc57d246e7
Fog: Factorize setUnifors()
2014-01-27 20:25:07 +01:00
Vincent Lejeune
0b531b20f7
SSAO: Use depth buffer.
2014-01-27 20:24:57 +01:00
Vincent Lejeune
5515f51f65
SSAO: Factorize setUniforms()
2014-01-27 20:24:47 +01:00
Vincent Lejeune
5e68334ce9
PointLight: Use depthbuffer
2014-01-27 20:22:01 +01:00
Vincent Lejeune
ac25b2b8b7
PointLight: Factorize setUniforms
2014-01-27 20:21:51 +01:00
Vincent Lejeune
5694d8b41a
Expose depthbuffer texture
2014-01-27 20:21:41 +01:00
KristofDM
fca20ae088
Final fix for issue #13 .
2014-01-27 18:14:50 +01:00
Vincent Lejeune
c77ffb1882
STKBillboard: Create new SceneNode wrapper.
2014-01-27 17:33:08 +01:00
Marianne Gagnon
9c29ae0b26
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-01-26 19:21:50 -05:00
Marianne Gagnon
601726db70
Fix harmless GCC warning
2014-01-26 19:21:07 -05:00
Vincent Lejeune
8a04c48cec
Reset skybox texture when loading track.
2014-01-27 01:14:20 +01:00
Vincent Lejeune
ac8a729bcd
SSAO: Actually simplifying code was a mistake.
2014-01-27 00:56:58 +01:00
Vincent Lejeune
684d265924
SSAO: Disable alpha test and simplify code
2014-01-27 00:53:52 +01:00
Vincent Lejeune
993d1e26dc
Revert "SSAO: Remove the strenght parameter"
...
This reverts commit b92f0b6ecc .
2014-01-27 00:52:20 +01:00
Vincent Lejeune
63882318a7
SSAO: Fix typo and use 16 samples
2014-01-27 00:47:35 +01:00
Vincent Lejeune
b92f0b6ecc
SSAO: Remove the strenght parameter
2014-01-27 00:41:41 +01:00
Vincent Lejeune
31991ecd7e
SSAO: Improve randomness using NEAREST filtering
2014-01-27 00:09:36 +01:00
Vincent Lejeune
bf22a1122b
GPUParticles: Force alpha additive for flip particles
2014-01-26 23:34:21 +01:00
Vincent Lejeune
a6c9f11374
SSAO: Use sampling points proposed by Auria.
2014-01-26 23:17:32 +01:00
Vincent Lejeune
270c2e2c52
Lightprepass: Handle skybox ourselves
2014-01-26 23:00:17 +01: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
30011be115
My tweaks to SSAO, to improve randomness and final blending
2014-01-25 22:03:47 -05: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
auriamg
4355c6450e
Merge pull request #12 from KroArtem/master
...
fix some cppcheck warnings
2014-01-25 17:23:24 -08:00
Vincent Lejeune
8b5df4143f
Fix attempt for black objects.
2014-01-26 01:56:08 +01:00
Vincent Lejeune
88561aa838
STKMesh: Implement (single) texture detail support for objectpass shaded objects.
2014-01-26 01:33:13 +01:00
Vincent Lejeune
2e994502e3
Properly handle unlit object.
2014-01-26 01:09:25 +01:00
KroArtem
fe9cd74934
fix some cppcheck warnings
2014-01-25 23:21:12 +04:00
Stephen Just
8d0bf49cbd
Update gitignore file
2014-01-25 15:44:59 +00:00
Vincent Lejeune
06ba2fcb6a
STKMesh: Use transparent shader for onttextureblend
2014-01-25 23:09:00 +01:00
Vincent Lejeune
f287cc611d
STKMesh: Factorize transparents for reusability
2014-01-25 23:07:07 +01:00
Vincent Lejeune
2e6f95712c
Use named passes
2014-01-25 23:02:24 +01:00
Vincent Lejeune
e6c419e695
SSAO: Improve the initial sampling values.
2014-01-25 22:59:09 +01:00
Vincent Lejeune
724aed6609
STKMesh may want to draw rimlimit materials
2014-01-25 22:57:51 +01:00
Marianne Gagnon
825ee2fdfe
Fix compilation
2014-01-24 21:02:21 -05:00
Marianne Gagnon
77f36e3e2f
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-01-24 19:13:59 -05:00
Marianne Gagnon
07eba6dfd7
Minor profiler updates
2014-01-24 19:13:53 -05:00
Vincent Lejeune
00b6705624
Revert "Factorize GL state changes to get better performances."
...
This reverts commit 17be149e02 .
2014-01-25 01:05:10 +01:00
Vincent Lejeune
17be149e02
Factorize GL state changes to get better performances.
2014-01-25 00:58:35 +01: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
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
Vincent Lejeune
c7b2f82e8f
Revert "Move final blit in renderGLSL instead of pp"
...
This reverts commit 16d87cf820 .
2014-01-25 00:22:44 +01:00
Vincent Lejeune
16d87cf820
Move final blit in renderGLSL instead of pp
2014-01-24 21:37:34 +01:00
Vincent Lejeune
a8ce8c9344
STKAnimatedMesh: Fix setMesh.
...
We don't clean our vram however.
2014-01-24 21:12:55 +01:00
Vincent Lejeune
324c1c1e95
STKMesh: Properly handle setMesh
2014-01-24 21:07:49 +01:00
Vincent Lejeune
c9ecaffb2b
STKAnimatedMesh: First pass id is 0, not 1
2014-01-24 20:34:23 +01:00
Vincent Lejeune
8bd6d7945c
STKAnimatedMesh: Support for rimlit karts
2014-01-24 20:29:54 +01:00
Vincent Lejeune
559e0a96ca
Remove wrong glHint
...
Spotted by ARB_DEBUG_OUTPUT
2014-01-24 20:27:18 +01: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
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
Vincent Lejeune
a257c1a35c
STKAnimatedMesh:
...
Avoid copying mesh in the second pass.
2014-01-24 00:19:10 +01:00
Vincent Lejeune
b362185593
STKAnimatedMesh: Plug the Light prepass system
...
Now animated object are rendered like static object with our pipelines.
rimlimit shader needs to be ported though.
2014-01-23 23:26:43 +01:00
Vincent Lejeune
24fa173c60
STKMesh: Staticify draw function for reusability.
2014-01-23 22:12:03 +01:00
Vincent Lejeune
176e46e5a9
STKAnimatedMesh: Uses custom render.
...
But not direct gl draw call yet.
2014-01-23 21:35:56 +01:00
Vincent Lejeune
b738b1eab3
Revert fog move after transparent pass.
2014-01-23 20:17:17 +01:00
Vincent Lejeune
12f961ee97
Fix lightviz always actived
2014-01-23 20:15:29 +01:00
Vincent Lejeune
f60af23ecd
LightPrepass: Disable light on non stkmeshes
2014-01-23 20:05:35 +01:00
Vincent Lejeune
4ebb0ee8d8
OGL32CTX: Fix minimap/kart selection orientation
2014-01-23 20:05:07 +01:00
Vincent Lejeune
9a5bf69ca8
STKMesh: Add an animated variant
...
Not customised atm.
2014-01-23 19:14:13 +01:00
hiker
2bfdfc0373
Fixed crash when trying to vote.
2014-01-23 13:25:50 +11:00
hiker
6066dba9d0
Fixed compiler error.
2014-01-23 13:24:08 +11:00
Marianne Gagnon
70fed45ec1
Fix skin crash
2014-01-22 20:15:35 -05:00
Marianne Gagnon
069f15937a
Improve profiler a little
2014-01-22 19:40:40 -05:00
Marianne Gagnon
1d2473e585
Colorize profiler bars so we can see something
2014-01-22 19:21:45 -05:00
Marianne Gagnon
583092bbf8
Don't return pointer to temporary object
2014-01-22 19:03:55 -05:00
hiker
1e721906e7
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-01-23 09:55:52 +11:00
hiker
57ff391cc3
Re-enable voting for addons.
2014-01-23 09:55:32 +11:00
hiker
d4b95e81b4
Moved hash function from StringUtils into player, there is no
...
other use of that function.
2014-01-23 09:54:48 +11:00
Vincent Lejeune
66894dfeaf
LightPrepass: Reenable light debug view
2014-01-22 23:11:49 +01:00
Vincent Lejeune
fc9144786b
Use texture swizzle when SSAO is disabled
2014-01-22 22:52:46 +01:00
Vincent Lejeune
b94f8f0c18
Light: Factorize some code.
2014-01-22 22:22:54 +01:00
Vincent Lejeune
68976a7a8e
STKMesh: Found the correct swizzle for untextured geometry
2014-01-22 19:07:59 +01:00
Vincent Lejeune
d13032ca9b
STKMesh: Support for untextured object
...
The color are not the correct one though...
2014-01-22 18:47:22 +01:00
Vincent Lejeune
38fc539520
Enable debug
2014-01-22 18:06:39 +01:00
hiker
6b27179b96
Added missing initialisation, some cosmetic changes.
2014-01-22 17:26:03 +11:00
hiker
c72544b49d
Added missing calls to Screen::init().
2014-01-22 16:54:57 +11:00
hiker
476d7db741
Disable online/login widget while login/logout are in progress (to
...
avoid race conditions, i.e. a new login arriving at server before
previous logout was processed).
2014-01-22 16:43:59 +11:00
hiker
2821913b47
Go back to main menu when login out.
2014-01-22 16:34:45 +11:00
hiker
836b9fae9c
Improved layout of login screen.
2014-01-22 16:20:45 +11:00
Vincent Lejeune
23e5a6c304
Fix kart selection upside down bug
2014-01-22 03:26:04 +01:00
Vincent Lejeune
0926c7be51
Fix Water
2014-01-22 03:16:01 +01:00
samuncle
65a72f2ba8
Correcting a bug with the linker
2014-01-22 02:26:30 +01:00
Vincent Lejeune
3410b3df6f
OGL32CTX: Fix mipmap in gui
2014-01-22 02:11:28 +01: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
hiker
e891adc8a4
Improved cmake configuration to copy the dlls into the bin
...
folder, which makes it much easier to start STK from within VS
(just set supertuxkart to be the startup project). Note that
this requires the new dependencies_for_0.8.2.zip to be installed!
2014-01-22 10:23:08 +11:00
hiker
a6108181e8
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-01-22 10:01:41 +11:00
Vincent Lejeune
4cbbf91e4e
Light: Sunlight uses the new shaders.
2014-01-21 23:45:53 +01:00
gl3nn
4438db3bbf
Fixes #11
2014-01-21 23:11:22 +01:00
Vincent Lejeune
5f942a9d8b
OGL32CTX: Replace a couple of draw2DImage/draw2DRectangle
2014-01-21 23:01:58 +01:00
hiker
0d51477f5b
Disabled online menu by default (use --online to get access to it).
2014-01-22 08:52:22 +11:00
Vincent Lejeune
271a26eaf0
OGL32CTX: Always return true when a feature is queried
2014-01-21 22:25:19 +01:00
Vincent Lejeune
f880d13175
Fix FBO related queries with OGL3.2+
2014-01-21 22:25:18 +01:00
hiker
5918f43ce6
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-01-22 08:06:28 +11:00
hiker
1930c362d5
Updated source file list (forgot to update this when removing some files).
2014-01-22 08:05:47 +11:00
Vincent Lejeune
5c2b39794c
Render fog on top of transparent and fix bubbles
2014-01-21 21:49:19 +01:00
hiker
5474b5528f
Removed unnecessary parameter from onUpdate calls.
2014-01-22 07:43:17 +11:00
Vincent Lejeune
cebcfabf05
GPUParticle: Simulation uses vao now.
2014-01-21 21:21:03 +01:00
Vincent Lejeune
9da56ddefc
STKMesh, GPUParticles: Some factorization.
2014-01-21 20:58:24 +01:00
Vincent Lejeune
1f4e697e48
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-01-21 20:34:25 +01:00
Vincent Lejeune
63a611b9ea
GPUParticles: Use VAO
2014-01-21 20:34:20 +01:00
samuncle
5efa395acb
SSAO is stronger now
2014-01-21 20:06:06 +01:00
Vincent Lejeune
43e4db99b1
GPUParticles: Factorize shader loading in shader.h/cpp
2014-01-21 19:36:55 +01:00
Vincent Lejeune
0d57f4db0d
Hack to make displacing object non animated and thus STKMeshes.
2014-01-21 18:42:19 +01:00
Vincent Lejeune
f95c6f0277
STKMesh:Displace support
2014-01-21 18:42:18 +01:00
Vincent Lejeune
7faed75a84
STKMesh: Add support for Displacing
2014-01-21 18:42:18 +01:00
Vincent Lejeune
478a9ab5d3
STKMesh: Some simplifications.
2014-01-21 18:42:18 +01:00
hiker
f0365fc7a0
Removed old login dialog. Fixed tabs in login screen that
...
were not properly focused.
2014-01-21 17:14:23 +11:00
hiker
50ef878e39
Enabled at least VERIFYPEER.
2014-01-21 11:24:07 +11:00
hiker
b9b2f9626e
Support running stk from the cmake bin directory.
2014-01-21 08:59:55 +11:00
hiker
f346bc444e
Fixed linux compilation.
2014-01-21 08:59:00 +11:00
hiker
6c02f99bca
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-01-21 08:13:55 +11:00
hiker
0cefc1d79c
Fixed crash in first-time-start of STK when glsl reported to
...
be available, but doesn't work.
2014-01-21 08:13:03 +11:00
hiker
f33d547c54
Moved verbose option to be done even if a file is downloaded.
2014-01-21 08:12:08 +11:00
Vincent Lejeune
a67f5bf511
STKMesh: Use forward rendering for transparent
...
Transparent objects may be double sided (like bubble),
it doesn't make sense to use a deferred renderer.
2014-01-20 21:42:38 +01:00
Vincent Lejeune
f3a9b24880
STKMesh: Start support for transparent object.
...
Highly experimental, only applies on the blob shadow under karts.
2014-01-20 20:43:39 +01:00
Vincent Lejeune
ceb1fdc88a
SSAO: Use a single texture fetch for random.
2014-01-20 20:43:03 +01:00
Vincent Lejeune
aeba31c4cf
Profiler: Fix the rendering and use finer grain.
2014-01-20 20:06:04 +01: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
Vincent Lejeune
0817ec4ee0
STKMesh:Another round of factorization.
2014-01-19 21:35:09 +01:00
Deve
c34e752b23
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-01-19 21:34:14 +01:00
Deve
dcfd55502c
Added experimental change which allow to use alt-tab and other shortcuts on linux when game is run in fullscreen mode.
...
This method is used in many other projects and should work good. Currently modern games
use window manager fullscreen rather than grab whole mouse and keyboard.
Tested on Gnome, Unity and Openbox and it works well. Though it should be tested also on
other desktop environments.
Also performance impact should be tested.
I added simple workaround for Gnome, which sometimes creates fullscreen window smaller
than display.
If some problems will occur, feel free to revert it.
2014-01-19 21:31:54 +01:00
Vincent Lejeune
e26f8d4bc8
Some welcomed factorization.
2014-01-19 21:17:51 +01:00
Vincent Lejeune
32836cf93d
Use 8 samples instead of 16
2014-01-19 20:57:58 +01:00
Vincent Lejeune
24443829db
STKMesh: Support grass shader
2014-01-19 20:56:10 +01:00
Vincent Lejeune
99dad9c304
Remove unused normalmap/splatting providers
2014-01-19 19:54:20 +01:00
Vincent Lejeune
859be83074
Explicitly define fragment exported values.
2014-01-19 19:31:00 +01:00
Vincent Lejeune
bf52c2abf8
Undefine ARB_DEBUG_OUTPUT
2014-01-19 19:00:59 +01:00
Vincent Lejeune
e4acf49e91
Fix a crash with snow enabled tracks.
2014-01-19 18:54:00 +01:00
Vincent Lejeune
fb6649eaad
texture2D is deprecated, use texture instead
2014-01-19 18:53:35 +01:00
Vincent Lejeune
496146b617
Use linear filtering for glow effect
2014-01-19 18:21:19 +01:00
Vincent Lejeune
d6d8301f17
SSAO: Use a noise texture rather than a function
2014-01-19 18:20:57 +01:00
Vincent Lejeune
ab3cb86359
Use nearest sampling for some others rtts
2014-01-19 02:38:52 +01:00
Vincent Lejeune
f54b9efebd
Use nearest filtering for some rtt
2014-01-19 02:28:10 +01:00
Vincent Lejeune
4d66503dae
STKMesh: Use objectref now
2014-01-19 02:15:17 +01:00
Marianne Gagnon
5ce82f9f55
Add a bunch of profiling markers. Gives us some idea where time is spent. Not perfect but better than nothing
2014-01-18 19:48:20 -05:00
Vincent Lejeune
2609e5c709
LightPrepass: start porting object_ref
2014-01-19 01:32:08 +01:00
Vincent Lejeune
9ddfa9261a
Revert to a specific define for ARB_DEBUG_OUTPUT
...
It does not work well with nvidia driver.
2014-01-19 00:43:12 +01:00
Vincent Lejeune
bd972be83a
Remove some unused shaders
2014-01-19 00:26:54 +01:00
Vincent Lejeune
e8f8aae5f3
Fix build on linux
2014-01-19 00:02:30 +01:00
Vincent Lejeune
a33195bc15
STKMesh: Avoid recomputing MVP several times
2014-01-18 22:15:55 +01:00
Vincent Lejeune
603fdbb70a
Factorize mesh shader.
2014-01-18 21:59:48 +01:00
Vincent Lejeune
6df85e260c
Shaders: FullScreenShader are not loaded at startup.
...
Besides being cleaner it also help finding error in shaders.
2014-01-18 21:35:52 +01:00
Vincent Lejeune
6a995ab178
STKMesh: Clean our buffers when deleted.
2014-01-18 20:47:53 +01:00
Vincent Lejeune
a1f5e47cba
Use ARB_DEBUG_OUTPUT on windows in Debug mode.
...
Hopefully the extension will work properly with every driver...
2014-01-18 20:28:13 +01:00
Vincent Lejeune
00cf026051
Tweak glow so that black halo is less visible.
2014-01-18 20:11:18 +01:00
Vincent Lejeune
47099fb1a3
Use glow vao.
2014-01-18 19:56:35 +01:00
Vincent Lejeune
5f7e6b2834
Some fixes to the renderer.
2014-01-18 19:47:18 +01:00
Vincent Lejeune
dec2cb29ec
STKMesh: Support splatting
2014-01-18 19:03:10 +01:00
Vincent Lejeune
fbe9b26127
STKMesh: Support spheremap material
2014-01-18 18:10:22 +01:00
Vincent Lejeune
002bb9c276
Remove unused spheremap.vert/frag
2014-01-18 17:26:01 +01:00
Vincent Lejeune
42e6da443a
Simplify Spheremap shader.
2014-01-18 03:25:54 +01:00
gl3nn
0058002260
Merge branch 'master' of https://github.com/supertuxkart/stk-code.git
2014-01-18 02:31:19 +01:00
gl3nn
27a28514e7
Fix the game state of when dialogs should be popped up.
2014-01-18 02:28:22 +01:00
Marianne Gagnon
2e21d40ce4
Support tangent meshes in MeshTools
2014-01-17 19:33:54 -05:00
gl3nn
ca8d9560b7
Forgot to take out the log statement.
2014-01-18 01:23:48 +01:00
Vincent Lejeune
32ec3c0f07
STKMesh: Use a better error message instead of crashing
2014-01-18 01:18:40 +01:00
Marianne Gagnon
5a2ad7c8aa
Create mesh with tangents if needed in track objects too
2014-01-17 19:16:01 -05:00
gl3nn
9ac3702da4
Merge branch 'master' of https://github.com/supertuxkart/stk-code.git
2014-01-18 01:07:32 +01:00
gl3nn
3941b782b8
Fix for the overloaded toString() function that takes booleans as
...
parameter.
2014-01-18 01:07:01 +01:00
Marianne Gagnon
95103c988f
respect the new flag and avoid creating animated meshes where unecessary
2014-01-17 18:55:47 -05:00
Vincent Lejeune
eb86182710
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-01-18 00:48:13 +01:00
Vincent Lejeune
605becfbdc
OGL32CTX: Enable glsl based on GL major version.
2014-01-18 00:47:31 +01: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
auriamg
18484df443
Merge pull request #4 from thelittlegumnut/Ticket_#1148
...
Ticket #1148
2014-01-17 15:07:48 -08:00
Vincent Lejeune
787866909d
SSAO: Do not use trilinear filtering
...
Normals RTT is not mipmapped and thus bad things happened above a
certain value in the depth buffer because of trilinear filtering.
2014-01-17 23:59:08 +01:00
Vincent Lejeune
693e2c7e33
STKMesh: Support NormalMapped meshes.
2014-01-17 23:50:06 +01: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
Vincent Lejeune
8e1d76dd8f
Throw a fatal error if we ask a normalmap effect and the underlying mesh doesnt have one.
2014-01-17 21:15:43 +01:00
Vincent Lejeune
620be813eb
Forget an extra qualifier
2014-01-17 19:33:44 +01:00
Vincent Lejeune
5a5a39f586
OGL32CTX: Use the userconfig parameter to decide to use glsl.
...
Queried extensions does seems to disable glsl when using a core context.
2014-01-17 19:28:26 +01:00
Vincent Lejeune
2500c6cb49
Fix compilation on non VS build
2014-01-17 19:22:00 +01:00
Vincent Lejeune
ef163b29df
LightPrepass: Remove Forced bloom.
...
This will be implemented using emissive material but our material loaders doesn't support it.
2014-01-17 19:21:23 +01:00
Max Teufel
2721e2d82a
Using GitHub Flavored Markdown in INSTALL.md to fix some mistakes from commit b903f8788c
2014-01-17 19:00:16 +01:00
Vincent Lejeune
77c9289645
LightPrepass: Reenable glow pass.
2014-01-17 18:52:44 +01:00
Max Teufel
b903f8788c
INSTALL rewritten in Markdown. Note: This commit maybe needs a correction because the Ubuntu command is very long.
2014-01-17 17:45:53 +01:00
thelittlegumnut
9730e05b1d
Changed challenge completion strings.
2014-01-17 19:34:22 +11:00
gl3nn
97c19ece3c
Merge branch 'master' of https://github.com/supertuxkart/stk-code.git
2014-01-17 04:58:29 +01:00
Torben Carrington
15401c0b02
Fixed music starting in menu, also corrected using the startRightNow parameter in MusicManager::startMusic()
2014-01-16 19:13:23 -08:00
vlj
6ac970d9a3
STKMesh: Use SSAO
2014-01-16 23:14:59 +01:00
Vincent Lejeune
c7fe307a52
LightPrepass: Split the rendering in 2 phases.
2014-01-16 17:51:33 +01:00
Vincent Lejeune
734f320f75
STKMesh: Filter stkmesh using stencil and disable lightblend on them.
2014-01-16 17:51:30 +01:00
Vincent Lejeune
7cda534451
STKMesh: Enable it unconditionnaly, but dont use it on shader_ref
2014-01-16 17:51:26 +01:00
Max Teufel
1b45204c0a
TODO rewritten in Markdown.
2014-01-16 17:43:22 +01:00
Max Teufel
19b495d9a0
Remove unneeded CHANGES file.
2014-01-16 17:43:22 +01:00
Max Teufel
62ece5cd59
CHANGELOG rewritten in Markdown.
2014-01-16 17:43:22 +01:00
hiker
da7bad92e6
Don't return error code if a file to be removed does not exist.
...
Improved error handling in addons.xml download.
2014-01-16 15:29:47 +11:00
Marianne Gagnon
472274561d
Update INSTALL file
2014-01-15 18:41:17 -05:00
Deve
57ea6ae0d0
Update .gitignore file
2014-01-15 20:31:15 +01:00
Deve
c2c7d618f4
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-01-15 19:57:44 +01:00
Deve
2bb859dcd7
Actually testing commit. Update .gitignore file.
2014-01-15 19:56:06 +01:00
Arthur-D
65c0c95490
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-01-15 19:34:16 +01:00
Max Teufel
4dd5ab3b65
README rewritten in Markdown. Fixed some minor mistakes too.
2014-01-15 19:30:31 +01:00
Joerg Henrichs
0a1016db71
STKMesh: Some factorisation
2014-01-15 13:19:55 +11:00
Joerg Henrichs
c622ba258c
Made stk-assets the default name of the assets data directory.
2014-01-15 11:56:34 +11:00
Joerg Henrichs
981036656d
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-01-15 11:53:32 +11:00
Joerg Henrichs
4f740fd6a5
Some refactoring
2014-01-15 11:51:48 +11:00
Joerg Henrichs
0464274b84
STKMesh: Fix glUniform wrong call
2014-01-15 11:51:01 +11:00
Marianne Gagnon
bc6be28f7d
Add ignore file
2014-01-14 19:50:51 -05:00
Joerg Henrichs
949877b826
Fixed compiler warning.
2014-01-15 11:49:37 +11:00
Joerg Henrichs
0adddd4401
STKMesh: Force GL_REPEAT to wrapped texture component.
...
It fixes bad uv in valley.
2014-01-15 11:48:40 +11:00
Joerg Henrichs
e6bfc695cb
SSAO: Honor the user parameter.
2014-01-15 11:47:24 +11:00
vincentlj
f338fbacb1
SSAO: Use a proper rand() function to generate fragment local coordinate system.
...
This new level of randomness get rid of most banding effect, SSAO now looks quite good.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15072 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 14:22:01 +00:00
hikerstk
9ee06a5fe0
Replaced boolstr with toString specialisation for bool;
...
fixed translations in current user. Otherwise many many
cosmetic only changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 11:47:25 +00:00
vincentlj
dafc30b2d0
Force blending mode for draw2d.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 01:31:26 +00:00
vincentlj
23d0b42b5f
Light: Simplify slightly shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15069 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 01:24:28 +00:00
vincentlj
a5c84822cc
Fix colortexturedquad shader/vertexpointer.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15068 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 01:05:03 +00:00
vincentlj
d5c06c8583
Fix colored rectangle color.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15067 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 00:11:59 +00:00
vincentlj
1cdb8ec8f3
OGL32CTX: Use VAO for draw2DImage, remove ALPHA_TEST as it is deprecated
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15066 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 00:00:21 +00:00
vincentlj
492dae5358
Fix windows build
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15065 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 23:56:59 +00:00
vincentlj
6697a2d7af
Another batch of conversion to draw2DImage
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15064 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 23:19:47 +00:00
vincentlj
c283f82729
Use draw2DImage for other components in race gui
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15063 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 23:07:29 +00:00
vincentlj
a60f549760
Fix draw2drectangle and spread use of draw2Dimage
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15062 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 22:59:45 +00:00
vincentlj
35f37a62c2
Font looks better now.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15061 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 22:28:10 +00:00
vincentlj
43a206ff2c
Characters are now black again.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15060 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 22:16:04 +00:00
vincentlj
c88d89a4f0
SSAO: Some tweaks.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15059 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:59:59 +00:00
vincentlj
df62ac5949
OGL32CTX: Render gui using shaders.
...
Font is temporarily white.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15058 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:31:47 +00:00
vincentlj
a16402e676
OGL32CTX: Missed a draw2DImage call
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15057 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:22:47 +00:00
vincentlj
6f680c1a8e
OGL32CTX: Use our draw2DImage for scalable_font.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15056 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:18:40 +00:00
vincentlj
e23d9c23e9
Clean SSAO Provider.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:02:39 +00:00
vincentlj
d84bc88d47
SSAO: Use direct gl calls.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15054 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 17:56:05 +00:00
vincentlj
e2a6ce7889
Remove an unneeded drawAll.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15053 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 17:41:19 +00:00
vincentlj
959ad054de
Clean Fog provider.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15052 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 17:37:33 +00:00
vincentlj
badb01c68b
Use custom gl calls for fog.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15051 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 17:30:25 +00:00
vincentlj
6f2f7c480a
Use direct call for some gaussian3blur invokation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15050 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 16:54:48 +00:00
vincentlj
f2ef95a7b5
Found another instance of PassThrough Shader usage.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15049 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 16:40:31 +00:00
vincentlj
4063fe83a9
Remove rain effect provider it's not used anymore.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15048 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 16:05:46 +00:00
vincentlj
c02d99ed9f
GPUParticles: Do not grow when size is 0
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15047 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 16:05:26 +00:00
vincentlj
c520db663f
OGL32CTX: Some fixes.
...
The track is now displayed (even with light) but not the karts, animations...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15046 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 15:28:37 +00:00
vincentlj
6a8396ea33
Forget a passthrough call and fix texturedquad shader.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15045 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 15:22:58 +00:00
vincentlj
3504f04a4e
Remove unneeded flip shader.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15044 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 14:54:07 +00:00
vincentlj
7d1df19342
Use a passthrough shader for some fullscreen effect.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15043 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 14:50:16 +00:00
vincentlj
645d4504ab
Clean GaussianBlur6 shaders.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15042 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 14:31:31 +00:00
vincentlj
62e5fbf6ad
Use direct call for Gaussian 6 Blur.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15041 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 14:23:30 +00:00
vincentlj
9b4288b576
Lights: Clean lightblend provider.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15040 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 13:43:18 +00:00
vincentlj
a21f77706a
Lights: Also use direct calls for lightblend.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15039 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 13:38:59 +00:00
vincentlj
4f209d38c6
Light: Readd blending so that sunlight is not killed by pointlight.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15038 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 13:15:51 +00:00
vincentlj
1edba6d394
Clean PointLight Provider and snow provider.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15037 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 13:07:12 +00:00
vincentlj
f654967b07
Lights: Use custom gl calls.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15036 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 12:56:27 +00:00
hikerstk
d53e3180ac
Fixed enabling internet in the GUI (i.e. re-init of
...
news manager and addons manager will happen now).
For online menu a dialog is now presented to explain why
it can't be selected if internet is disabled. Addons can
be selected with internet is disabled if there are
existing addons (so that it's possible to remove addons
without internet access).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15035 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 11:35:12 +00: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
hikerstk
c8d066ce37
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15033 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 03:02:08 +00:00
vincentlj
468d5458bc
Clean color_level shader providers.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 00:11:31 +00:00
vincentlj
164f1dda11
Use direct gl calls for color_levels.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15031 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 00:04:53 +00:00
vincentlj
6d57947c73
Remove some leftover comments.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15030 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:52:13 +00:00
vincentlj
1da42b81a6
Remove PPDisplace provider.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15029 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:47:34 +00:00
vincentlj
47d7f4fdd4
Use direct gl calls for ppdisplace.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15028 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:43:00 +00:00
vincentlj
98f58d257c
Clean bloom shader provider.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:27:31 +00:00
vincentlj
f8e17ecffa
Use direct gl calls for BloomBlend too.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15026 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:19:28 +00:00
hikerstk
a49d85fa3e
Replaced pop_back, which is not available on all compilers (for
...
std::string).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15025 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 22:43:45 +00:00
samuncle
1ca7413aed
Add better lantern post
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15023 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 21:34:43 +00:00
vincentlj
9968ff1ccf
Use custom opengl call for bloom fullscreen shader.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 21:07:14 +00:00
samuncle
2dea6ded0d
Add another track to test the library
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 20:46:33 +00:00
samuncle
b278f7abd5
Second object to be added in the library :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15020 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 20:43:06 +00:00
samuncle
7252df884a
First generic texture to be used in a track
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15019 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 20:41:33 +00: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
c5edf82a6c
GPUParticles: This should fix boxemitters.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15017 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 19:49:23 +00:00
auria
795ac13c95
Removed unused music
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15016 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 19:10:18 +00:00
vincentlj
e4dd3c9ed6
GPUParticle: Fix sudden amount of particle for boxemitter
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15015 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 18:40:04 +00:00
auria
a32f760d03
clarify music licenses
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15014 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 18:36:36 +00:00
auria
03618a5bc5
Apply slighly modified version of patch from ticket #1121
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15013 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 18:04:00 +00:00
vincentlj
55d085bf6d
STKMesh: Now use separate shader for ref/noref object
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15012 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 17:40:39 +00:00
vincentlj
8e7e84c984
STKMesh: Use VAO for faster rendering
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15011 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 17:03:02 +00:00
vincentlj
1e84b57269
STKMesh: Some improvements
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15010 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 16:25:47 +00:00
vincentlj
61003eda91
STKMesh: Some refactorisation work
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15009 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 15:53:41 +00:00
vincentlj
fda86ed45c
STKMesh: Rendering in minel is working (except transparent part)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15008 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 15:27:24 +00:00
vincentlj
f6b7fb3853
Fix what looks like type
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15007 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 14:34:34 +00:00
hikerstk
b136e16f7a
Preparation to remove network_http (its work will be
...
taken over by the reqeust manager).
Initialise news and addons manager in a separate thread
and not from the network_http thread anymore. Icons are
also downloaded now from the request manager instead
of the network_http.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15006 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 11:20:32 +00:00
samuncle
9804cbddeb
Better lanterns
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15004 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 02:26:46 +00:00
samuncle
0058097123
Better lantern
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15003 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 02:26:08 +00:00
vincentlj
ebaec55f4d
STKMesh: Rendering works...sortof
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15002 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 00:26:18 +00:00
vincentlj
b5a9932169
STKMesh: Forget to add byref modifier
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15001 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-11 23:26:58 +00:00
vincentlj
15dc149799
STKMesh: Rendering implemented although it's a big red shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15000 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-11 22:57:48 +00:00
vincentlj
d255f4f049
STKMesh: Some more code to load vertex data, but rendering is still using old path
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14999 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-11 18:12:04 +00:00
vincentlj
2aea7a2624
STKMesh: Add some code that just mimic CMeshNode behavior
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14998 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 22:10:21 +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
vincentlj
9b1853ef21
GPUParticles: Remove the unused PointEmitter class.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14996 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 21:12:38 +00:00
vincentlj
80faf282dc
GPUParticles: Fix glsl versions.
...
Only heightmap sim require version 140.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14995 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 17:42:43 +00:00
vincentlj
ba61e2cbe4
GPUParticles: Finish refactorisation.
...
Heightmap are enabled again for snow.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14994 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 17:40:25 +00:00
vincentlj
af81015fcd
GPUParticles: Use different shaders to avoid unneeded uniforms.
...
Heightmap affector is temporarly disabled.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14993 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 17:26:57 +00:00
vincentlj
45067e59cf
OGL32CTX: Revert to use gl_TextureMatrix[]
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14992 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 01:29:32 +00:00
vincentlj
0a50518fb9
Remove code loading snow shaders.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14991 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 00:59:15 +00:00
vincentlj
90f701c42d
OGL32CTX: Attempt to replace implicitly defined uniforms for objectpass
...
This breaks animated textures in xr591...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14990 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 00:31:22 +00:00
vincentlj
857f675f35
OGL32CTX: Replace another series of implicit declared uniforms
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14989 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 00:30:56 +00:00
hikerstk
ba1e6465ef
Fixed #1146 - removing directories didn't work (listFiles() returns absolute
...
paths (now??)).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14988 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 23:07:01 +00:00
hikerstk
0566d785b1
Fix crash when re-trying to delete an addon (that was deleted
...
previously, but had an error).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14987 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 23:03:00 +00:00
hikerstk
e2f636153b
Fixed crash #1146 ('install' widgets is removed in case
...
of an installed icon, so m_install was NULL).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 22:52:18 +00:00
vincentlj
9a99c3dae6
OGL32CTX: Replace implicitly defined uniforms in displace
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:32:51 +00:00
vincentlj
75b492b871
OGL32CTX: Replace implicitly declared uniforms in bubble
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14984 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:32:38 +00:00
vincentlj
751d09d35f
GPUParticles: Remove snow shader as we use another now.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14983 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:09:50 +00:00
vincentlj
986f3a6098
OGL32CTX: Remove implicitly defined uniforms in normalmap
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14982 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:08:23 +00:00
vincentlj
e6d774a3ac
OGL32CTX: Remove implicitly defined uniforms in splatting
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14981 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:08:15 +00:00
vincentlj
9ba803140a
OGL32CTX: Remove implicitly defined uniforms in grass
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14980 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 17:08:03 +00:00
vincentlj
9d7ab41c11
OGL32CTX: Replace ftransform by gl_ModelViewProjectionMatrix * gl_Vertex.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14979 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 16:09:27 +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
vincentlj
99fde5faa4
GPUParticles: Kill snow flake when it hit the ground according to the heightmap.
...
(Actually we move it outside of the player view)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14977 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 01:49:06 +00:00
vincentlj
105761151d
GPUParticles: Another snow tweak
...
Slightly more particles, constrained rotation direction, lower speed (vector and rotation)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14976 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 01:32:17 +00:00
vincentlj
73ba827763
GPUParticles: Tweak snow parameters.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14975 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 01:16:46 +00:00
vincentlj
42c16b32cb
OGL32CTX: Replace deprecated "varying" by in/out semantic and make them explicit.
...
gl_Texcoord[]/gl_Color should be explocitly passed as in/out.
Compilers can pack varyings if the architecture does benefit from it (for instance intel mesa driver) but on the other hand they usually don't change size of varying even if there is only a single component used.
So storing vec2 into vec4 may waste performances.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14974 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 00:17:28 +00:00
vincentlj
2ba340b6cb
OGL32CTX: Add vertex shader where default one was assumed.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14973 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 23:11:10 +00:00
vincentlj
632f75c130
OGL32CTX: Create a GL 3.1 context on windows (backward compatible)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14972 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 21:50:46 +00:00
vincentlj
53e32a9848
GPUParticles: bump shaders version to 140 to enable texture buffer support.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14971 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 19:09:04 +00:00
vincentlj
35ed664a8e
GPUParticles: Fix folded snow particles.
...
I forgot I was using instanced quad...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14970 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 19:02:56 +00:00
vincentlj
28d02f9622
GPUParticles: Implement particle flip.
...
Snow quads suffers from folding, I have to investigate and/or ask hiker.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14969 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 18:34:57 +00:00
hikerstk
c5c17747cb
Fixed linux compilation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14968 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 12:13:26 +00:00
hikerstk
a1c964f71d
Some refactoring and cleanup of the online request handling:
...
added setter/getter, renamed functions to have better names,
removed synchronousRequest from http_manager. Should be no
change in functionality.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14967 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 12:08:46 +00:00
samuncle
ff7a3d01c4
Minor update on the skybox shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14966 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 08:48:46 +00:00
auria
31b03dc50e
tweak reset planes to minimize their impact on the snow particles heightmap
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14964 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 23:46:21 +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
vincentlj
17667d9be0
GPUParticles: Also clean texture when object is deleted.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14962 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 21:27:18 +00:00
vincentlj
5b8ca4fcd7
GPUParticles: Implement HeightMapAffector equivalent.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14961 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 21:06:06 +00:00
deveee
0be4825ef2
Minor correction in garage action
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14960 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 08:17:22 +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
auria
bbcc2afa61
Use light absolute position for culling, the relative position was incorrectly used
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14957 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 02:12:17 +00:00
hikerstk
1265abd4a0
Remove definition of NDEBUG for VS (since VS will define this
...
automatically in release builds), and add -DDEBUG in VS only
for debug builds.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14956 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 02:04:31 +00:00
auria
fb3b2a9f80
ozoneone provided a new version of the snow song
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14954 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 01:20:30 +00:00
auria
e4fdbc6724
Fix LOD issues in snow mountain, causing assertion failures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14952 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 01:17:16 +00:00
vincentlj
d776fdc4e7
OGL32CTX: Add vao functions even if we don't use them atm.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14951 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:52:49 +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
b1c8898b54
Bump track XML version number to 6
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14948 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:05:40 +00:00
vincentlj
51023ceb81
GPUParticles: Fix adjusted_initial_velocity computation.
...
Thank to Auria and hiker for their help.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14947 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:04:43 +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
vincentlj
88bb3a8da8
GPUParticles: Add support for increase factor
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14945 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 22:58:04 +00:00
vincentlj
7a95d46448
GPUParticles: Use smoothstep for fade out and remove direction modulation by size.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14944 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 22:35:54 +00:00
hikerstk
6808a9df1a
Fixed warning and incorrect color values (for non-shader).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14943 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 21:10:50 +00:00
deveee
75cfde3d69
Fixed compilation in debug mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14942 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 20:05:23 +00:00
vincentlj
841aa05cc0
GPUParticles: Use gl_vertexID to improve particle emission rate handling.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14941 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 18:05:21 +00:00
hikerstk
3e8741c442
Fixed typo.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14940 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 12:28:24 +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
068eb8ece2
Add ozoneone's new snow song
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14938 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 02:55:37 +00:00
samuncle
47a2d1529a
Add more lanterns using the library
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14937 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 02:03:42 +00:00
samuncle
d9fd3ccfe0
Add high adhesion for the tunnel so we can do the sunt featured in top gear
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14936 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 00:29:11 +00:00
vincentlj
fb57b75cc0
GPUParticles: Attempt at fixing the green flash bug in minel
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14935 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 23:32:24 +00:00
stephenjust
78ca6f2b9c
Don't crash when shaders are disabled when drawing snow
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14934 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 22:56:27 +00:00
vincentlj
62f815ff68
Debug output: Use a comment to tell not to remove that code
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14933 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:39:54 +00:00
vincentlj
ffc1524bf7
GPUParticles: Use fallback if glsl is disabled.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14932 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:39:42 +00:00
samuncle
e03c1cf13e
Better splat map
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14931 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:34:54 +00:00
stephenjust
9bf632fb4b
Fix crash loading tracks when shaders are disabled
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14930 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:14:28 +00:00
vincentlj
2fe8eafbe1
OGL Debug : looks like not all driver on linux support arb debug output :(
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14929 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:14:10 +00:00
vincentlj
869386c338
Centralize view and proj matrix to avoid recomputation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14928 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:12:19 +00:00
vincentlj
7778a71c0a
OGL32CTX: Use correct type in coloredquad.frag
...
Spotted by arb debug output too.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14927 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 18:54:40 +00:00
vincentlj
aad565a9bf
GPUParticles: Use size value so that it doesn't get optimized away
...
Spotted by arb debug output.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14926 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 18:44:52 +00:00
vincentlj
ce62c0b3b7
OGL32CTX: Fix osx build
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14925 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 17:57:22 +00:00
vincentlj
8a33f14da5
OGL32CTX: Request a 3.0 backward compatible context in linux.
...
This allows to enable ARB_DEBUG_OUTPUT extension.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14924 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 17:48:36 +00:00
vincentlj
d44c28ca9e
OGL32CTX: GL_QUADS was deprecated, use TRIANGLE_STRIP
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14923 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 17:34:01 +00:00
samuncle
d7a26c7c67
Add smooth transition between textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14922 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 12:55:08 +00:00
samuncle
5f2955ec63
I added a screenshoot to avoid the error in log console
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14921 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 00:31:02 +00:00
vincentlj
d28a869444
Fix skybox frag shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14920 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 00:08:11 +00:00
vincentlj
fa068d7810
OGL32CTX: Ask #version 130 for all our shaders
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14919 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 00:08:00 +00:00
vincentlj
57d5d658a0
OGL32CTX: Fixes sourcerect in draw2DImage replacement
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14918 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 23:28:59 +00:00
vincentlj
1a883f740f
OGL32CTX: Fix build issue
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14917 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 22:15:28 +00:00
vincentlj
7bb1e671b2
OGL32CTX: Port draw2DRectangle too
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 22:10:56 +00:00
vincentlj
3598643332
OGL32CTX: Uses draw2DImage in skin.cpp
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14915 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 21:43:49 +00:00
vincentlj
bfc7efa5cc
OGL32CTX: Remove it in default build.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14914 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 21:34:06 +00:00
vincentlj
169f29f7b2
OGL32CTX: Spread use of Draw2DImage custom function.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14913 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 21:31:57 +00:00
samuncle
2731d07df0
Add a pink lantern to test the library
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14911 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:47:49 +00:00
samuncle
bd69c8c0d7
Add the skybox shader for harvest. For the moment it's still an object in the transparent pass. The object should be in the skybox pass
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14909 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:43:18 +00:00
samuncle
b2f2cb62f7
Add the first object to test the library (It's programmer's art for the moment :P)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14908 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:42:04 +00:00
samuncle
54a9a94ed2
Oups I forget to remove some debug printf :3
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14907 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:34:38 +00:00
samuncle
aedb68a88a
Minor correction for a window path
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14906 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:29:02 +00:00
vincentlj
c18248220a
OGL32CTX: Move an include outside of win32 #ifdef, and always define OGL32CTX for apple
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14905 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 17:32:42 +00:00
vincentlj
9555bf8c7f
OGL32CTX: Use alpha when required
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14904 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 17:15:29 +00:00
vincentlj
b28044e603
OGL32CTX: Implement a draw2DImage function using shaders.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 17:12:30 +00:00
vincentlj
aa1bdcf10f
GPUParticles: Move opengl function to newly created glwrap.cpp
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14902 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 16:09:33 +00:00
auria
4e4a6bc6d5
Re-export a bunch of tracks to go along the new LOD format
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14896 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 23:45:37 +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
vincentlj
10947608d8
GPUParticles: Honor decrease in emission rate.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14894 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 20:01:09 +00:00
vincentlj
ccf226d8e8
GPUParticles: Use a struct instead of hardcoded stride/offset values
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14893 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 18:52:48 +00:00
vincentlj
977494c88f
GPUParticles: More refactoring
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14892 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 18:21:13 +00:00
vincentlj
d8302dcaee
GPUParticles: Refactoring
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14891 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 18:07:11 +00:00
vincentlj
d63b5af530
GPUParticles: Tell irrlicht that we disable cullface test.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14890 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 17:40:14 +00:00
vincentlj
96841f5731
GPUParticles: Avoid particle respawning at too old location.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14889 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 17:20:26 +00:00
vincentlj
39d79c555a
GPUParticles: Reset irrlicht blending state.
...
It fixes some flickering artifact.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14888 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 16:53:55 +00:00
vincentlj
1b564a81a7
GPUParticles: Attribute initial lifetime to box emitter.
...
This is needed so that effect looks stationnary.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14887 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 15:59:39 +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
4c11ca65f0
Properly parent light nodes and add them to the scene manager
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14885 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 01:35:42 +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
vincentlj
c25e1c2472
GPUParticles: Use a better fake material that modelize well which states we touch.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14883 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 01:06:21 +00:00
vincentlj
2a1a28c459
GPUParticles: Avoid emitting particle at (0,0,0)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14882 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 00:53:41 +00:00
vincentlj
66ab51789f
GPUParticles: Implements SphereEmitter.
...
Explosion looks a bit like a geyser of flame, needs tweaking.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14881 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 21:36:13 +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
vincentlj
9fe6b6a6e9
GPUParticles: Clean vbo memory when ParticleSystemProxy is deleted
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14878 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 20:32:18 +00:00
vincentlj
419bea3bfd
GPUParticles: Avoid recompiling the same shaders over and over, and use a global vbo for quads.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14877 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 20:20:21 +00:00
vincentlj
9c163db7c7
GPUParticles: Add an parameter to turn alpha additive particle on/off.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14876 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 19:52:32 +00:00
vincentlj
be93478687
GPUParticles: Fix orientation of reemitted particles.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14875 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 19:13:57 +00:00
auria
6b7e33a267
Convert a bunch of prints to our logging system, it's long overdue we fix that
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14874 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 19:11:01 +00:00
vincentlj
09926f6f4e
GPUParticles: Modulate direction length to avoid banding with lot of particles.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14873 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 18:59:15 +00:00
auria
3abc10338e
Add Krobonil's new song for lighthouse
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14871 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 18:20:51 +00:00
vincentlj
28ebf0c08c
GPUParticles: Implement box emitter
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14870 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 18:11:28 +00:00
auria
245910d3a7
Apply patch to improve paths on osx
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14869 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 16:43:03 +00:00
vincentlj
823a40e45e
GPUParticles: Fix particles randomly becoming blocky in some track.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14868 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 03:06:23 +00:00
vincentlj
7f45adeeb0
GPUParticles: Enforce GL_BLEND
...
This fixes some issue with Harvest experienced by samuncle
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14867 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 02:45:47 +00:00
samuncle
baefa0a4ec
I added an alpha channel to the texture to see if it works with the new GPU particle system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14866 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 02:45:25 +00:00
vincentlj
217d512d5f
This shouldn't have been added to previous commit, sorry.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14865 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 02:17:58 +00:00
vincentlj
94d9eb056a
GPUParticle: Use Irrlicht blending state
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14864 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 01:59:02 +00:00
vincentlj
0fc2f664b6
GPUParticles: Forgot to reset vertexattrib divisor
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14863 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 01:51:52 +00:00
vincentlj
a38522da70
GPUParticle: Implement size parameter.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 01:11:44 +00:00
vincentlj
1d3a33bf8e
GPUParticles: Use quad instead of POINT_SPRITE
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14861 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 20:39:00 +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
6fb8188e07
Fix finding data files on OSX
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14856 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 19:22:05 +00:00
auria
692d5a582d
Fix OSX compilation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14855 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 19:11:23 +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
vincentlj
9fbd2b19b1
GPUParticle: Implements generic fade out and rework particles lifetime.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 17:25:10 +00:00
hikerstk
9417541adf
Uodated list of dependencies.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14851 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 09:30:41 +00:00
samuncle
a152cf4577
I have corrected missing texture in harvest. I also added a skybox, to test my new skybox shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14850 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 01:06:36 +00:00
samuncle
d5e598f7f6
I had some problem with -fno-rtti when I tried to build then trunk
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14849 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 01:03:46 +00:00
vincentlj
8670aa86dc
GPUParticle: Fix some parameters not used correctly.
...
Some previous value (like dt) came from debug attempt.
This fixes the particles behind the wheels of the wagon in minel.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14848 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 00:58:42 +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
vincentlj
e2dc4d98df
GPUParticle: Fix typo in header file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14846 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 00:18:31 +00:00
vincentlj
e7a355c38e
GPUParticle: Use a fake material to avoid Irrlicht to bypass material update.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14845 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 00:06:08 +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
vincentlj
fc5a802135
GPUParticles: Subclass CParticleSystemSceneNode to make implementation cleaner
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14842 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 22:52:32 +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
vincentlj
7645883508
GPUParticles: Remove PE when the particle emitter is removed.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14839 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 14:10:32 +00:00
vincentlj
d4b9ccf499
GPUParticles: Particles don't follow their source.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14838 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 13:57:55 +00:00
vincentlj
ebb45f8de6
GPUParticles: Use an ugly hack to get correct position
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14837 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 23:55:55 +00:00
vincentlj
88f39e4186
GPUParticles: Properly handle parent for gpuparticles
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14836 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 22:53:28 +00:00
vincentlj
ab447c1bed
GPUParticle: Disable depth write instead of disabling depth test.
...
It's probably faster.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14835 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 22:53:17 +00:00
vincentlj
ea1e5077a2
GPUParticles: Disable depth test to avoid rendering artifacts
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14834 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 22:26:59 +00:00
vincentlj
64fa58d198
GPUParticles: Add them to scenemanager root instead of a percamera node
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14833 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 22:26:50 +00:00
vincentlj
871e2b998b
GPUParticles: Implement softness and use maxangle spread
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14832 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 20:36:21 +00:00
vincentlj
636f6412ab
GPUParticles: Use some parameters, and texture, to display particles.
...
Still not enabled.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14831 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 19:24:19 +00:00
vincentlj
a2d1a86bac
Lights: Make possible for gpu drivers to unroll loop.
...
GPU doesn't like indirect addressing and thus it's better to have unrolled loop. This is only possible for loop with a static iteration count.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14830 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 18:37:45 +00:00
vincentlj
4c725ac8f4
GPUParticles: Got PointEmitter to draw something at last.
...
Still WIP, uses a #ifdef to disable it but I wanted to keep a working commit
somewhere in case I mess up somewhere.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14829 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 18:23:36 +00:00
deveee
681f095140
Move action-trigger to the center of garage.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14826 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-28 22:30:29 +00:00
auria
db44852d8b
Make lights fade in when they appear
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14824 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-28 22:02:29 +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
4c2c76088a
Change pt-BR name to be more accurate
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14822 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-28 02:09:08 +00:00
samuncle
1bb766a84f
Add animated light :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14821 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-28 01:58:43 +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
vincentlj
e72e2de8ca
GPUParticle: Make RainNode a child of GPUParticle
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 22:52:44 +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
vincentlj
187abe584b
GPUParticles: Reenable rain, windows build is fixed
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 22:02:12 +00:00
vincentlj
df2bd304ab
GPUParticles: Put it in its own file
...
Disable rain while doing ping-pong between os to get windows opengl callback
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14814 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 20:56:29 +00:00
vincentlj
6d0e6a67b2
PointLight:Fix shader arithmetic type mismatch reported by mesa
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14813 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 17:03:02 +00:00
vincentlj
616a2e7a75
Rain: Precompute as many shader data as possible
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14812 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 17:01:45 +00:00
vincentlj
9826af0747
Rain: Avoid making a draw call that won't be used and make some cleanup
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 16:37:24 +00:00
vincentlj
224b246f17
Irrlicht: make setRenderStates3DMode public
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14810 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 16:37:15 +00:00
samuncle
8695d355eb
New color correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14809 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 04:08:34 +00:00
samuncle
7b90be2e29
Add a massive vegetation under water to test
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14808 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 03:52:08 +00:00
auria
f1aac9e317
Adjust logging to make STK less annoying to debug under visual studio : output the logging directly to VS's output pane, instead of having to reply on the small cmd.exe popup that closes as soon as the application exits
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 03:02:33 +00:00
vincentlj
053170fc27
Rain: Use transform feedback to decouple simulation from rendering
...
It's the base for a future gpu based particle system
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14806 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 02:50:25 +00:00
samuncle
cb21815054
Improved the specularity by adding a little offset to the energy
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14805 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 02:41:58 +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
samuncle
32a61d770e
Allow kart to use specular map
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14803 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 02:06:08 +00:00
vincentlj
0506b98540
Lights: Add a metric to measure light count pressure in a scene.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14802 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 01:00:20 +00:00
vincentlj
30a030bd4c
Light: Pseudo sort lights distance using bucket to evict them fast.
...
Lower max light level to 16 as it proves sufficient.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14801 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 00:34:41 +00:00
vincentlj
4d0b9236b2
Lights: improve bandwidth usage
...
It should improve performance a lot, but it handles at most 32 simultaneous lights on screen.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14800 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 22:55:15 +00:00
vincentlj
508d866a2b
Lights: Improve culling system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14799 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 20:14:49 +00:00
samuncle
46cce1e347
I updated the requirements to something a but more realistic
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14798 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 19:42:11 +00:00
vincentlj
4f36e43b14
Fix unexported FragData
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 18:28:35 +00:00
vincentlj
5512a72d62
Lights: Remove hard edge and attenuate specular
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14796 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 18:00:54 +00:00
samuncle
067564c7cf
A little change to make the SSAO better (IMHO) other opinions are welcome)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14795 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 02:55:10 +00:00
samuncle
5c03faab06
Better glow
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14794 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 01:21:03 +00:00
samuncle
122567f0d3
Increase the max distance of the displacement effect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14793 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 01:01:12 +00:00
samuncle
9be8adaa15
Reduce the color correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14792 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 00:02:55 +00:00
samuncle
22440ddc60
Minor correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14791 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 23:39:06 +00:00
samuncle
55f7817286
Some tweak to test the new light system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14790 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 23:29:32 +00:00
vincentlj
c2b18a0a1c
Light: Export the correct value for specmap in grass/splatting shaders
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14789 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:48:27 +00:00
vincentlj
3a6e75b656
Light: Fix skybox bug with specmap and update grass/splatting shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14788 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:40:14 +00:00
samuncle
702b9cca97
Add an alpha channel to test the specular map
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14787 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:23:51 +00:00
vincentlj
ec3fd4fa13
Light: Support for specularmap
...
The specular map is embedded in the alpha component of texture.
Alpha value of 1. means no specular, alpha of 0. means 100% specular.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14786 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:19:18 +00:00
samuncle
4435ffbaa0
Better lights (with color correction, and glow :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14785 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 19:36:07 +00:00
samuncle
6b4f44acbc
We don't need lightmap
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14783 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 05:54:21 +00:00
samuncle
42829e3c8d
I have add some dynamic lights in the old mine just to test the new pipeline
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14782 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 05:52:08 +00:00
samuncle
292fbadc33
Correction of a bug caused by the skybox
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14780 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 02:58:30 +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
vincentlj
8c44b06e9f
Revert "Test commit, to be reverted"
...
This reverts commit 6cbdcff4da246b940cad4affc2beff101dd3fcc0.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14778 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 22:35:19 +00:00
vincentlj
65b32757f3
Separate Diffuse and Specular components
...
This allows to bypass alpha test, and have colored specular lights.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14777 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 20:51:53 +00:00
vincentlj
5f23483bd9
Fix some shaders not building with mesa
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 02:47:33 +00:00
vincentlj
7f51c9737b
Test commit, to be reverted
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14770 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 01:59:35 +00:00
vincentlj
88ac0ba6cf
Attempt to mimic blender light behavior.
...
The attenuation assumes a power distributed on the whole sphere surface.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14769 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 01:44:40 +00:00
vincentlj
dec4cd1453
Change light visualization.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14768 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 01:33:42 +00:00
vincentlj
bd52770ceb
SSAO: Avoid sampling outside of RTT_NORMAL_AND_DEPTH textures.
...
It should remove artifact at the edge of the screen.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14767 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 00:37:58 +00:00
samuncle
ea7ac5391a
Better normal (I think everything is corrected now. Vlj if you find more normal to be corrected please ask me
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14766 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 00:36:52 +00:00
vincentlj
49131c68af
Rain: Fade instead of intersecting geometry
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14765 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 00:33:57 +00:00
samuncle
7633db8c03
A majority of normal have been corrected to be SSAO friendly
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 23:48:25 +00:00
vincentlj
f17f8b62cb
SSAO: Use the correct distance for range checking
...
It should remove halo around kart heads.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14763 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 23:25:14 +00:00
samuncle
d6a532151d
Color correction is removed due to vlj's demand. Now we can test safely HDR
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14762 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 22:45:15 +00:00
vincentlj
3fc63a9f27
SSAO:Ensure sampled point are inside the unit sphere.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14760 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 20:25:58 +00:00
vincentlj
a3cc62a985
SSAO: Use a costheta factor to ease transition
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 20:02:11 +00:00
vincentlj
a9db4c7c3f
Generate random value for SSAO sampling
...
It should improve SSAO at least with grass.
However this make the algorithm even more sensitive to bad normals.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14758 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 18:14:02 +00:00
vincentlj
352009b2ce
RTT_COLOR uses float format.
...
This allows for hdr, however there is no tone mapping at the moment.
color_level.frag can be currently used for such purpose, it gives a nice look
in harvest, although it is way too bright.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14757 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 17:00:42 +00:00
vincentlj
34d83859cd
Add support for specular light
...
Note that specular light is applied unconditionnaly, thus every object will shine.
TODO : Specular map should be defined using texture or a material flag.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14756 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 17:00:34 +00:00
vincentlj
5db6705889
Move SSAO code into renderLight in order to use a lighter rtt (8 bits instead of 32)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14755 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 17:00:27 +00:00
vincentlj
45db87de8a
Merge normals and depth RTT into a single one
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 16:59:55 +00:00
deveee
8b76971a54
Minor changes in soccer setup gui
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14752 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 17:44:09 +00:00
deveee
bc2eefe1dc
Fixed displaying more than 2 karts in soccer setup screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14751 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 16:14:26 +00:00
samuncle
cc7b5d2229
Some normal are corrected
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 03:32:08 +00:00
vincentlj
07abdebbfa
Add range check for ssao + fix for nvidia
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14748 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 03:03:07 +00:00
samuncle
3423227e9e
I have added a better grass texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14747 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 01:44:04 +00:00
samuncle
0f9081ef56
Increase the size of the grass
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14746 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 01:35:20 +00:00
samuncle
a66096f978
Add a grass texture for harvest
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14745 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 01:16:30 +00:00
samuncle
43d919ec6a
Reduced the LOD distance of the kart. The player won't notice since he is focused on the race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 00:08:17 +00:00
deveee
1a2d26b894
- Fixed crash when goal is scored after time limit
...
- Set time max value to 15 - playing one game 45 minutes doesn't have a sense
- Remember time value in user config
- Little beter look of soccer setup
- Set goal-limit mode as default
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-21 17:04:46 +00:00
samuncle
52ebb9a300
Little value for the distance of animated kart. You won't notice the difference (expect that the christmas hat isn't displayed with the non animated version
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14742 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-21 14:36:40 +00:00
deveee
49be95b966
Some code cleanup in soccer world
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-20 21:11:22 +00:00
deveee
ae2a41f2d0
Fixed problem with karts which were assigned to wrong team in soccer mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-20 00:29:37 +00:00
auria
c6fd5cde1c
Apply patch by vlj to improve rendering, thanks a lot!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-20 00:11:57 +00:00
samuncle
73f9779324
Animated texture corrected. Thanks to vlj :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-19 23:58:26 +00:00
auria
118705f19a
Apply patch by Vlj to put normals in eyespace coordinates and reenable normal mapping, thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-19 00:13:17 +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
deveee
0337ae19e0
Some code cleanup in soccer setup screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14735 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 19:40:36 +00:00
deveee
b7a80dd686
Wait for animation before continue using mouse - soccer setup screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14734 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 12:15:53 +00:00
deveee
25d4bf488a
Fixed start game with disabled shaders
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 10:09:03 +00:00
auria
6ec9bf1d0f
apply egypt song tweaked mixing
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14732 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 00:00:16 +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
248551bcb6
Minor modification in previous commit - play sound only once
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 21:13:27 +00:00
deveee
8947227175
Allow to confirm players using mouse in soccer setup screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14729 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 21:01:20 +00:00
deveee
79e01c5c56
Hopefully fixed problem with tutorial which sometimes was starting in a loop
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14728 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 21:00:56 +00:00
samuncle
7147490b90
Add a light + color corretion (to make tests)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14727 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 01:06:27 +00:00
funto66
2c1853e54d
Remove some more useless autotools files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 23:21:37 +00:00
funto66
c225eb6d32
Remove now useless m4 scripts (we fully switched to CMake)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14725 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 23:10:15 +00:00
deveee
0188e90a65
Fixed crash when you start tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14724 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 21:37:20 +00:00
samuncle
ed3472efd3
Add lights to test the light prepass system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14723 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 19:04:20 +00:00
samuncle
08f211129b
Now the sunlight doesn't kill point light. Thanks to Vlj for the correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14722 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 18:33:00 +00:00
deveee
5c58d07278
Avoid code duplication in debug.cpp file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14721 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-13 10:34:58 +00:00
deveee
3ba8f1bd38
Add parachute to debug menu
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14720 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-13 09:06:54 +00:00
deveee
052b7eb07f
Add powerups for all local players in debug mode.
...
Often I need to check something in multiplayer mode - for example bubblegum shield.
Why F1, F2, F3 etc. was removed? ;-(
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14719 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 17:51:14 +00:00
hikerstk
55cd9dd09a
Made 'min_speed' available for zipper only, re-exported spaceship track.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14716 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 05:37:15 +00:00
auria
c10ed78570
remove problematic code that crashes for some people only, will figure that out later
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14715 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 01:10:28 +00:00
samuncle
017b49daed
Just a quick 'n' dirty fix to have an idea how new texture migh look in the new pipeline
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 01:04:22 +00:00
auria
ae337751de
Remove cand's water-wave node for now and revert back to irrlicht's for the moment. The problem with cand's is that it ignores all our material flags, which is not acceptable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14713 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 00:50:27 +00:00
auria
22d6dd56ea
Undo change that would limit STK to 35 FPS
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14712 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 00:39:19 +00:00
auria
e9e3a8afff
remove seemingly useless if in shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14711 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 23:46:40 +00:00
hikerstk
bce4a075ba
Added support for a texture specific minimum speed. This fixes issues with
...
AI karts (esp. EndController) not being able to do long jumps. Added setting
for minimum speed to Enterprise track (EndController were not able to finish
the jump on the ramp).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 22:12:14 +00:00
samuncle
1a776381d5
Correction of the ssao vs fog bug (thanks to vlj). Minor tweaks for fps display and debug menu
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14709 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 22:11:32 +00:00
auria
1fb46ca162
Reduce intensity of glowing objects like giftboxes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:16:40 +00:00
auria
d18068f2f4
Remove forgotten debug log
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:03:59 +00:00
auria
afe826a814
Fix disabling lights on additive materials; fix disabling fog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:02:20 +00:00
auria
b09b879238
typo fix
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14699 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:01:24 +00:00
auria
aa848f0afd
small fixes to material
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 00:40:51 +00:00
auria
b27a5363bd
Fix objects that are unaffected by lights
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 00:37:07 +00:00
samuncle
08299c6e58
Minor correction to use correct blending
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14696 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-10 02:01:18 +00:00
samuncle
14432a8689
Now the grass shader can be used with the new pipeline.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-10 01:58:22 +00:00
samuncle
7e8159ccd6
Now the grass shader can be used with the new pipeline. Todo make a basic ubershader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14694 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-10 01:57:20 +00:00
auria
95ffca1bf0
Remove alpha to coverage
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 23:38:53 +00:00
hikerstk
0076bec269
Converted glow color back fro floating point to integers (upon artists requests).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 20:02:43 +00:00
samuncle
f2df11e5a0
Now there the FPS display has a background so it's more readable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 14:07:42 +00:00
nixt
ef792f3d01
Revert r14686: Accidentally applied to trunk. When did I get trunk privileges?
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14687 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 14:07:28 +00:00
nixt
5113dc3337
SVN messed up data/shaders in my branch. 76 files in local copy, 21 on SF. Re-adding folder to branch.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14686 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 13:11:09 +00:00
hikerstk
09dc33d07e
Moved the glowing data from stk_config.xml to items.xml.
...
Unfortunately I can't test (since the shaders don't work for me).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 12:24:26 +00:00
deveee
375b1a1f06
Revert r14655. It is already fixed in r14660 and redeclaration breaks compilation.
...
Tested on VC2010 - it compiles and runs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 09:50:37 +00:00
hikerstk
3af325d672
Fixed VS 2012 compilation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 03:15:50 +00:00
samuncle
fe2c682ed1
Use the color violet for displaying FPS. Everything related to debug/etc should be in violet
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 02:59:29 +00:00
samuncle
4c1dd1ada4
Minor tweak to change the background of the debug menu
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 02:28:11 +00:00
auria
aebd8d2996
Minor tweaks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14678 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 02:15:54 +00:00
auria
0383a9ec55
more debug menu love
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 02:03:16 +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
auria
31c29c7a92
Fix visible line in front of kart in SSAO
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 00:39:07 +00:00
funto66
39046749d2
Add a debug menu + option to reload shaders (memory leak, yeah, but it's just for debugging)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 00:09:35 +00:00
auria
9a2b4cc3ab
Further modularisation of rendering
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 21:27:56 +00:00
hikerstk
5cf8c7bf77
Languages are now sorted alphabetically.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14670 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 20:47:49 +00:00
auria
db0a3d37a2
Undo samuncle's commit that added specular lights, but in a way that would only work on nvidia gpus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14666 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 20:19:46 +00:00
auria
f96a647a9c
Modularize the rendering a little (I am aware this results in a very small loss of performance, but given the large amount of virtual method calls we make every frame, should be pretty insignificant, and will make the rendering much easier to follow). Fix VS 2013 support issues. Improve material to reject mutually exclusive settings that result in render bugs.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 20:06:44 +00:00
auria
7bb321a108
fix vs2013 compilation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 17:19:04 +00:00
auria
668e8dc719
Apply supermat patch to remove a couple leftover hit messages, thanks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 17:10:20 +00:00
samuncle
1880cf9492
Palm trees are corrected #1120 . It was caused by the flag of the Z-Buffer that was disabled
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14661 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 14:04:46 +00:00
funto66
a6d4d423da
Fix compilation on VC2010
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 08:10:20 +00:00
samuncle
0f96fe219b
Correction of the window bug #1120
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14657 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 02:51:38 +00:00
auria
85191ef9b1
Fix compilation on VS < 2013, tested and confirmed to work by nixt
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14655 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 02:39:38 +00:00
auria
c6681f05bc
Fix crash when adding new device
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-07 17:02:22 +00:00
auria
b6002111b7
Add new music for minigolf
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14650 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-07 16:53:32 +00:00
auria
b8e42e3fe2
Apply patch tested by SuperMat to fix clang compilation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14649 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-07 16:23:40 +00:00
samuncle
627004a536
Add glow support for banana and bubblegum
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14648 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 23:19:43 +00:00
samuncle
b0ce591330
Better outline (glow) color for: banana, bubblegum, box and nitro
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14647 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 23:18:49 +00:00
hikerstk
723c4683ce
Fixed STK hanging on exit (at least in one case ;) ).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14645 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 13:13:16 +00:00
hikerstk
f7cf407208
Deallocated http manager earlier (in case that it is using a command
...
which needs any of the objects that have been deleted while cleaning up).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14644 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 13:12:45 +00:00
hikerstk
94abdc5b05
Improved work around for graphics cards that do not allow stencil for FBOs
...
(like Intel hd3000). If a FBO with stencil can not be allocated, disable
stencil, and switch off pixel shaders.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14643 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 12:05:21 +00:00
hikerstk
ee2cea0aca
Removed abbreviated language names from language selection widget.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14642 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 11:57:14 +00:00
hikerstk
86b1b67c61
Fixed windows compilation (missing lib), and some compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 03:54:31 +00:00
hikerstk
b074dc5f09
Moved all VS specific math code (i.e. for round(), isnan) into vs.hpp
...
and used it everywhere (I hope).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14640 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 03:49:55 +00:00
deveee
33525285d7
Fixed compilation problem
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14639 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:30:44 +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
deveee
33e09e8f59
Solved conflicts before merge hilnius branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14637 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:28:04 +00:00
deveee
bc46c305f3
Solved conflicts before merge hilnius branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14636 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:27:23 +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
samuncle
7f214d4458
Restore flip shader and put the color correction in a dedicated shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 14:24:02 +00:00
samuncle
6b0962f876
Add the callback for the color correction shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14631 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 14:21:27 +00:00
auria
85bfec00a0
Correct VS compilation (VS 2013 is 18, not 17)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14629 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:54:54 +00:00
hikerstk
8032fdb3b0
Converted line endings consistently to unix.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:46:55 +00:00
auria
a358c4d8ee
Change risky cast into dynamic_cast, fixing crash
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 01:38:29 +00:00
hikerstk
46bb243955
Added constant 'stencil' to make it easier to disable stencils for people
...
with cards that don't support it (like apparently hd3000).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 00:46:34 +00:00
auria
68820bb325
VS 2013 fixes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 00:36:44 +00:00
hikerstk
7c2e48e2c6
Fixed VS compilation (MAX_PRIORITY is a #define somewhere), and while
...
it can probably be disabled, it's just annoying to search the reason for
a rather incomprehensible error message all over again.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:54:11 +00:00
hikerstk
697a7cf111
Oops - forgot files in previous commit.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14621 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:11:29 +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
funto66
3b6aab44b5
Fix compilation with Visual Studio 2010
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 22:38:49 +00:00
hikerstk
0f098329a6
Removed mergeinfo in that branch.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:46:08 +00:00
hikerstk
4e134fbe82
Tried more fixed values.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:44:33 +00:00
hikerstk
15788359a6
Updated another mergeinfo file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:41:35 +00:00
hikerstk
94bf328e1e
Changed svn:mergeinfo to indicate that all revisions where merged (to solve
...
merging issues we have).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14612 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:32:08 +00:00
auria
faa7fd7ca5
fix typo that broke SSAO
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14611 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 23:22:03 +00:00
hikerstk
bc2432bb57
Merged with trunk, final part.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:43:14 +00:00
hikerstk
63d5961dd0
Merged with trunk, part 3.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:39:40 +00:00
hikerstk
71341a13f6
Merged with trunk, part 2.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:36:51 +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
samuncle
0a1431aed5
Corrected a bug on intel driver
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 23:46:12 +00:00
samuncle
9fdfb27a67
Add color correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 22:48:12 +00:00
hikerstk
ad0fd41d52
Fixed compiler warnings on VS.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 22:16:43 +00:00
samuncle
77db3a2a6e
A basic test (TODO, if this is accepted I should make a new shader for only this effect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 21:52:07 +00:00
samuncle
cd85c8418b
Better grass texture (more colorfull)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 21:51:49 +00:00
samuncle
aa95ccd5f4
Better grass texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14599 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 20:02:14 +00:00
auria
eaef91fc4b
Fix multiple crashes when new pipeline is turned off
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:42:14 +00:00
auria
f383440d7f
More post-graphics-merge tweaks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:18:14 +00:00
auria
e5fbd5d1fb
First reorganisation of graphics options. Remove old MSAA anti-aliasing, offer only new MLAA. Organise options in more logical groups, improve overall popup layout
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:05:44 +00:00
samuncle
4e2a553b1f
The test map harvest for the new shader pipeline
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14595 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:51:27 +00:00
samuncle
063ea38cc6
A new bias (it works better with harvest
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:47:30 +00:00
auria
d1b8bc6073
Apply modified version of patch to remove remaining hit messages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:23:48 +00:00
auria
d843c1812d
add back accidentally deleted music
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 17:06:54 +00:00
auria
8cf0030a27
Apply patch to fix OSX compilation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 16:51:08 +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
auria
8c17d21282
Deprecate old texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14589 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 20:19:04 +00:00
auria
d8645620e0
Add new egypt music by 0zone0ne
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 20:08:07 +00:00
funto66
3a659d45dd
Add basic crash reporting functionality on Windows
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-29 22:33:11 +00:00
hikerstk
ac0b0eb7fb
Fixed name of supertuxkart.appdata, added (untested) installation support for that file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:20:36 +00:00
hikerstk
11a0cf4b16
Added 'appdata' file for linux installations (see http://people.freedesktop.org/~hughsient/appdata/
...
for details).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:14:43 +00:00
hikerstk
26744f16d1
Removed minimal race gui.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:06:45 +00:00
hikerstk
b1c6ca2865
Updated translations (based on 0.8.1).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14582 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-28 06:02:48 +00:00
hikerstk
05607e862e
Goodbye hit messages (note: I had to rebuild from scratch
...
to avoid some strange crashes).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-27 21:43:34 +00:00
auria
e877e27f4f
Add new version of overworld music bu OzoneOne
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14579 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-26 23:29:32 +00:00
hikerstk
87cc616a6c
Fixed orientation of final 4 wheels that are added to an arena
...
in battle mode (plus some minor code cleanup).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14578 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 11:27:59 +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
7797e1cbc3
Updated Asian fonts.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 21:57:33 +00:00
samuncle
6e46086db7
Add the animation of the cart (like the old old mine)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 16:24:56 +00:00
hikerstk
a1eaada6da
Changed default settings for wiimote.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 10:05:49 +00:00
samuncle
05955679ce
I forgot some modifications
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14560 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 01:30:42 +00:00
samuncle
7a0f6a635c
Add a stop sign
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14558 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 01:27:16 +00:00
samuncle
d811af4ea6
A better screenshoot
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14557 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-24 00:22:26 +00:00
hikerstk
af605462b2
Enabled wiimote-debug output in release builds, changed debug
...
output to show the now used and derived value.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 22:55:35 +00:00
samuncle
86385f6107
Add an animation for arrows inside the castel (some player are lost)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 22:50:34 +00:00
samuncle
b06284f759
Add a glow effect arround crystal
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14549 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 22:19:50 +00:00
samuncle
fe9127ed49
Better lightmap using complementary colors
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14547 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 21:47:42 +00:00
samuncle
78b65ee2b6
Add an animation for the arrows. The right path should be more clear now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14543 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 21:15:23 +00:00
samuncle
bb50d719a3
I forgot a detail :(. The trunk of the palm tree wasn't on ground
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14541 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 21:08:38 +00:00
samuncle
db3f1b2c68
Fixing some flying objects
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14536 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 21:03:14 +00:00
samuncle
27a3009114
Add credit to the author of the trailer :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14534 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 17:29:26 +00:00
samuncle
a000aaf9f4
A better screenshoot for zen garden
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14533 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 16:51:11 +00:00
samuncle
84e6c4fea8
Even more lights for mansion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14530 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 16:46:13 +00:00
samuncle
ad3270ff37
Better sign for inns, bars, etc
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14525 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 16:22:32 +00:00
samuncle
9ec46b1f41
Add the texture for ants
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14521 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 15:29:57 +00:00
samuncle
f0b4a2ea7c
Now ants are in data/texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14520 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-23 15:29:00 +00:00
auria
9e7e80eed3
Restore missing OSX files and adjust CMakeList
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14518 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-22 00:27:33 +00:00
hikerstk
ea9b7fe05c
Removed 'for Windows' from the name.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14516 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 22:59:16 +00:00
hikerstk
24f13806b0
Disabled hardcoded setting of difficulty to hard when using profile
...
(difficulty can be set with --mode, this way every difficulty can be tested).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14514 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 10:21:49 +00:00
hikerstk
a97430c882
'Better' fix for incorrect time in easter egg mode - thanks to
...
Devee for diagnosing the problem!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14512 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 01:50:46 +00:00
auria
5ea57efaac
Fix small glitch in the overworld
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14509 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 00:49:24 +00:00
auria
5ab8b2b563
Fix crash on empty ribbons, required for what's coming next
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14506 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 00:14:57 +00:00
hikerstk
5a7fb84267
Fixed incorrect overloaded getTexture function (char * where handled
...
as bool, not std::string), avoided more crashes on missing textures,
adde better warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14505 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 22:37:12 +00:00
deveee
195daa8794
Avoid to run Easter Egg mode as Grand Prix.
...
I added new files to avoid a mess.
Proposed for 0.8.1
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 18:29:10 +00:00
samuncle
6871e604c7
Better lightmap
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14503 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 15:47:31 +00:00
deveee
8ea98eae71
Display time in race result of Easter Egg mode properly.
...
It was broken since Easter Egg starts as linear world. My proposition is to include it to 0.8.1 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14494 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 14:43:17 +00:00
hikerstk
e6660d7c74
Improved warning messages: most warnings about textures not
...
found will now be prefixed with a line indicating what kart
or track it comes from. Fixed crash in referee when a texture
did not exist. Irrlicht's warnings about missing textures
while loading a mesh will be prefixed by a line about which
kart/track is missing as well.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 10:56:42 +00:00
auria
1c78060772
Fix another non-pot icon
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14489 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 00:11:56 +00:00
auria
13bffe33f3
Fix a little bunch of non-pot textures (there are more)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14486 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 00:00:58 +00:00
auria
1db85badf2
Fix a few non-pot textures. Of course there are many more
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14484 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 23:49:15 +00:00
auria
f8feba2337
new icon by totoplus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14483 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 23:48:30 +00:00
hikerstk
6828007a51
Updated VS 2008 release project file (not necessary for cmake
...
based 2012 compilation) - saving this just in case that we
want to support XP longer.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14481 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 11:59:07 +00:00
hikerstk
a17db8d168
1) Fixed #1103 (installer does not remove shortcuts) by running installer as
...
admin which apparently is default in win7), and then setting SetSHellVarContext All
to tell the installer that the shortcuts are in AllUser.
2) Moved images out of supertuxkart directory (otherwise the images will be installed
with STK), added missing image.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14480 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 09:55:50 +00:00
hikerstk
4b057e320b
Removed old and outdated build support for VS and XCode.
...
CMake must be used now.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:12:46 +00:00
auria
685589a19c
Silence warnings that could occur when sound is disabled
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14476 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:09:19 +00:00
auria
fc37766a6f
fix harmless spinner warning
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14474 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-19 01:02:36 +00:00
yasin-ghannam
6de5854ef8
Fix Soccer Setup Screen Check box placement.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14473 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-18 02:15:05 +00:00
yasin-ghannam
287ff4c8ee
Added time limited-match instead of only goal-limited ones.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-18 01:58:10 +00:00
hikerstk
096c883552
Added new installer (which includes some commented out sections
...
which can be used to customise text), and new logo.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14471 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 23:58:42 +00:00
hikerstk
fb186d676c
Enable wiiuse by default.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 23:01:21 +00:00
samuncle
9825884124
Minor corrections + ants
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14466 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 22:29:01 +00:00
samuncle
4b99301b27
Minor modifications for the jump
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14465 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 21:15:15 +00:00
auria
6d3a45cdd9
Delete unused file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14464 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 19:43:34 +00:00
hikerstk
4057787955
Updated Asian fonts, see r14461 on 0.8.1.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14462 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 10:42:51 +00:00
hikerstk
77ed273821
Fixed VS compilation of font tool. The font_toop
...
option is now also marked as advanced. I also tried
to fix linux compilation, but that's untested (r14459 on 0.8.1).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14460 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-17 01:04:48 +00:00
deveee
75a339b099
Force speed of a kart to be equal to 0 while rescue/explosion animation.
...
It solves problem with speed-weighted objects. Perhaps also others, for example some sounds depend on speed.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-16 19:43:42 +00:00
deveee
a6952261e2
Stop sounds on close Grand Prix win screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14456 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-16 18:32:11 +00:00
auria
c3c2de2ce7
Remove very incomplete translations
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14453 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 23:12:22 +00:00
auria
e7091b5e83
update translations
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14452 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 23:08:46 +00:00
hikerstk
af70fc938d
On VS don't use a Source folder, which is just one
...
unnecessary hierarchy.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14451 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 22:45:14 +00:00
auria
6abb994a61
CMake : do not separate headers and source files when generating, place them next to each other
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14450 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 22:38:56 +00:00
hikerstk
ab96d1b128
Added simple script to update copyright dates.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14449 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 12:57:31 +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
auria
bc08b71eb6
Fix gnu nitro emissions
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14443 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:53:14 +00:00
hikerstk
5d7650c418
Reverted r14410 - the proper finding of textures when loading models
...
is implemented, and has worked properly in the last years. This patch
will unlikely fix the issue Funto had (incorrect texture for one kart),
but might have unwanted side effects which are hard to evaluate so short
before a release.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14442 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:40:53 +00:00
hikerstk
4b50173f33
Updated credits.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14440 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:27:33 +00:00
auria
e2400bacc4
Add 0.8.1 changelog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14439 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:13:32 +00:00
hikerstk
cce43a6555
Avoid calling guiengine::render if STK is about to be aborted. While
...
it didn't cause any problems so far, it feels wrong ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 00:05:35 +00:00
hikerstk
a7315d163b
Fixed minor memory leak.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14437 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 23:56:37 +00:00
hikerstk
8d98f6939c
Fixed minor memory leaks (the track.cpp caused warnings to be
...
printed by our leack checker).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14436 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 23:48:19 +00:00
funto66
22c4c85f56
Removed CRT security warnings from Irrlicht build (MSVC)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14435 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 22:29:12 +00:00
hikerstk
77d0740b36
Fixed crash on linux (stdout was closed, but leak check would try
...
to print some output).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14434 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 22:20:48 +00:00
funto66
e13e6feb4a
Remove hard-coded debug flag for Wiiuse with MSVC (Multithreaded Debug CRT)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14433 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 22:18:53 +00:00
funto66
3478d55236
Only expose USE_CPP2011 option for relevant platforms (UNIX-like)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 22:17:46 +00:00
hikerstk
3c45cdc559
Removed VS hard coded debug flag for irrlicht.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14431 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 22:12:45 +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
59f2e7ff75
Some code simplification for nitro emitters.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14427 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 10:49:02 +00:00
auria
ccefd0a3da
Try to fix clang compilation. Cannot really test it but hopefully will help
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14426 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 23:55:29 +00:00
hikerstk
e71d3e0288
Added push back to the soccer track border to avoid the ball
...
getting stuck there.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 23:48:14 +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
deveee
635ca52d23
Remove hat from pidgin - it doesn't work properly with this kart.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 20:23:42 +00:00
deveee
91d41e37b3
Remove saved GP when it was not continued.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 19:45:33 +00:00
deveee
49b5b52621
Revert my last change in .pot file. It is already not needed.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14420 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 19:32:53 +00:00
deveee
2127284e94
Now player can choose if he want to start new GP or continue previously saved.
...
Also change string to "Continue" to avoid problems with translations.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14419 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 19:32:11 +00:00
deveee
8cfb3d5d9c
Very quick workaround for ticket #1081 . Just inform a player that grand prix will be continued. Ideally player should choose if he want to start new GP or continue previously saved.
...
String "Continue Grand Prix" was translated in previous versions of STK and launchpad should remember it (I hope).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14418 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 08:48:09 +00:00
hikerstk
0438928933
Fixed fullscreen issues (resulting in rtt not working) on intel
...
graphics card. Strange thing: everybody should have been running
stk in 16 bit colour mode since r12825, and no one noticed??
Now we properly request and set 32 bit mode, and all is working
fine on intel.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14417 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-13 03:33:39 +00:00
hikerstk
caeb87d9a7
Added file missing in previous commit.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14415 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 09:35:51 +00:00
hikerstk
a5fd91959c
Removed some dead code, added documentation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14414 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 06:12:06 +00:00
hikerstk
0dd2c2110d
Updated translation (removed some incorrect strings, added
...
missing strings for video settings).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14413 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 00:44:34 +00:00
hikerstk
e1d3009053
Reduced xmas hat period to end 5th of January.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14412 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 00:39:22 +00:00
hikerstk
e98d15ef8b
Added easter egg related license info.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14411 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 00:16:38 +00:00
funto66
53297355f0
Set the B3D_TEXTURE_PATH Irrlicht Scene Manager attribute upon B3D file loading. Hope that this fixes the rare bug where I got Beastie's kart.png texture applied instead of Beagle's kart.png texture.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14410 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-11 23:13:47 +00:00
hikerstk
48ac2fdebf
Fixed position of wheels (karts are not flying anymore),
...
and skid marks (which is mostly a result of wheels actually
touching the ground now).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14409 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-11 21:07:16 +00:00
auria
21b6656516
Updated pidgin animation by chronomaster
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14408 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-10 20:30:30 +00:00
deveee
e1bc4ef8fe
Fixed #1089 .
...
Stop goal sound when the game is terminated or restarted.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-10 09:53:36 +00:00
auria
df66639717
Change soccer mode win sound, for which the license was unclear (and new one is IMHO better)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14404 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-10 00:55:57 +00:00
samuncle
2aee597a6b
Correction of the hat position
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14403 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-09 21:48:22 +00:00
auria
289f4b5f7b
Restore big digit font XML, which got corrupted somehow??
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-09 20:57:59 +00:00
auria
e5c73f7b86
Add new soccer ball by rudy
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 23:03:53 +00:00
auria
79e1dc6efd
Reset input at the end of easter egg hunt mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14399 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 22:12:05 +00:00
deveee
41bc19fa99
Add workaround for tickets #1084 and #1085 .
...
Currently there is no non-linear track where eggs could be hidden. Start track as linear solves problem with position after rescue.
Also add win animation when all eggs are collected.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14398 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 21:42:49 +00:00
hikerstk
86118b92ae
Updated and compressed the donation section.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 04:00:11 +00:00
hikerstk
376d60b8c6
Some refactoring of xmas code. Command line options:
...
--xmas=1 enables xmas hats anytime, --xmas=2 disables
it completely, and (default) --xmas=0 (default) switches
Xmas mode on between 17. of December and 9th of January.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-07 11:34:13 +00:00
samuncle
bc0724935e
Add copyright header to each shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14395 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 23:17:18 +00:00
hikerstk
15c26079f1
Raise karts somewhat when they are leaning (otherwise the
...
karts will be partially inside of the track). Some dead code
removal.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 06:22:51 +00:00
hikerstk
e024b73553
Avoid potential division by zero (which might cause crashes).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14393 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 06:21:32 +00:00
hikerstk
d7319b766f
Added new command line option "--camera-wheel-debug" which positions the
...
camera at wheel level (to better check if wheels are positioned at the right
height).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 06:08:31 +00:00
samuncle
5c5155cce5
Minor credits update with the author of the wallpaper/poster
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-06 00:07:54 +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
auria
b4c698760a
Fix "Guest" being untranslated despite appearing in the po file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-05 23:21:32 +00:00
auria
55b3077e63
Mark a few missing strings as translatable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14388 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-05 22:59:33 +00:00
samuncle
545f861c05
Minor credits update
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14387 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-05 00:33:56 +00:00
auria
c6114bd962
Fix accidental rename
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14386 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 23:16:27 +00:00
auria
30604e2500
small tweaks, as noted by samuncle the 'art direction' title does not make sense for me to have anymore, that's him now ;)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 23:12:33 +00:00
hikerstk
c0783283e0
Fixed VS compilation (without WIN32_LEAN_AND_MEAN
...
VS defines MAX_PRIORITY as a macro).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14384 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 09:58:24 +00:00
hikerstk
0be530faf0
Fixed compiler warnings (and removed some tabs).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14383 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 09:56:33 +00:00
deveee
992c8b70c5
Add easter eggs in Zengarden
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14381 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-03 17:15:32 +00:00
auria
96f7be1598
New method WorldWithRank::updateTrack(dt); was used by LinearWorld, but adding it to Overworld was forgotten, causing track objects to not work properly
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14379 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-03 02:28:23 +00:00
samuncle
df027159ea
Add cool stuff
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14377 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-03 01:14:55 +00:00
samuncle
1bd1c16fa4
I forgot a texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14376 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 22:02:44 +00:00
samuncle
ab619029e3
New sara with correct normals \o/
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14375 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 22:01:47 +00:00
auria
668555f0f2
Add easter eggs to mansion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14374 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 20:04:09 +00:00
auria
bba033b0cc
Disable reverse mode in egg hunt, many eggs that are hidden during normal play are very visible in reverse gameplay ;)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 19:41:31 +00:00
auria
be5139d694
Add easter eggs to hacienda
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14371 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 19:24:18 +00:00
deveee
c58889b088
Revert "Display parachute for a short while when a kart was shielded. Player should be informed that parachute is the reason of removed shield."
...
This reverts commit 2b7e3d693ebbf67fe586090214d0279ad4bf08d2.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14369 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 11:07:05 +00:00
deveee
852512ec0a
Display parachute for a short while when a kart was shielded. Player should be informed that parachute is the reason of removed shield.
...
Solution was suggested in comment to #1038 and is certainly not perfect, but I don't have better idea.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 09:38:59 +00:00
funto66
a153eb8c2c
Fix some errors in CREDTS (thanks supermat)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14366 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 08:02:12 +00:00
samuncle
abb26bf55e
A better version of spaceship. Now it has a skybox and more details
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14365 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 01:56:12 +00:00
funto66
550302488e
New XML syntax for the speed-weighted objects: now we can have several speed-weighted objects with different parameter values in a single kart.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-02 00:20:48 +00:00
auria
7f854b4729
minor tweaks to credits
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14359 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-01 00:42:24 +00:00
funto66
734fef45a9
Added speed-weighted texture animations, as requested by samuncle.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14358 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 23:46:36 +00:00
unitraxx
1074bf720e
Changed typo in my name.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14357 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 22:45:50 +00:00
magned
8dd928ba4d
Misc small corrections and additions.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14356 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 22:40:45 +00:00
hikerstk
bb329d845a
Updated and restructured credits.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-31 22:05:55 +00:00
auria
077615f309
Disable z buffer writes on shadows, can only help. Does not fix skidlines being behind wheels, however
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14354 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 23:15:57 +00:00
hikerstk
44f49b19b7
Removed debug option to always show skid marks.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14353 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 22:54:46 +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
deveee
4c88999317
Release skidding key when kart was stopped, on rescue animation etc.
...
Also avoid reset skidding in every frame when speed is equal to 0.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14351 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 18:57:24 +00:00
funto66
fdb2a06535
More subtle carpet animation for GNU + added nitro emitters behind the carpet
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14349 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 10:30:58 +00:00
deveee
6b9f69d2b2
Fixed typo.
...
I'm not sure if full update .pot file is needed.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14348 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 08:24:51 +00:00
hikerstk
8eaea2b1ba
Fixed typo in string, updated pot file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 02:59:43 +00:00
hikerstk
c58b005ba4
Rotate Easter eggs.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14346 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-30 01:07:08 +00:00
auria
42cf2c292a
Update egg hunt name/description and update .pot file with all latest strings
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14345 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 23:59:04 +00:00
auria
43e9d17eeb
Apply safe part of supermat's patch to let STK build on clang on OSX. The part about long GLuint remains to be seen, not too sure what to do about it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14344 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 23:14:51 +00:00
deveee
be22202a4d
Remove executable parameter in data files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14343 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 17:41:01 +00:00
deveee
658b67d4ad
Check if a track really has easter egg mode.
...
Eggs, but more colorful ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14342 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 07:38:34 +00:00
hikerstk
c187351efe
Added fraang's Easter Egg models. Feedback welcome - egg
...
or bunny ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14341 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 06:22:03 +00:00
hikerstk
07ac18dbe2
Added description for soccer and easter egg mode (I hope to replace
...
the bunny with easter eggs, so I mentioned eggs there ;) ).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 01:46:33 +00:00
auria
6139f6ef77
Improve what happens when you lose FTL. Should now be pretty clear
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14338 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 01:20:59 +00:00
auria
0c5eb2b115
Somewhat improve what happens when you lose Follow-The-Leader. Also make it more obvious to players they are in FTL mode, we got some reports of players confused in the FTL challenge
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14337 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 00:58:57 +00:00
auria
d507cf8e7d
Restore subsea after SVN crash
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14334 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 23:35:05 +00:00
hikerstk
206cc802e6
Modified instructions for connecting wiimote on windows, added
...
'OK/cancel' type to MessageDialog (instead of 'Yes/Cancel').
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14333 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 23:10:45 +00:00
hikerstk
3fae9270c2
Avoid concatenating translated strings, and moved comment so that
...
translators can see where the string is used.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14332 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 22:07:01 +00:00
hikerstk
9dc4c7a7e9
Removed tab.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 22:04:43 +00:00
hikerstk
86ffab7c8c
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14330 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 21:40:19 +00:00
deveee
e8cbca9e51
Added missing file in Lighthouse. Everything other seems to work properly.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14329 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 17:57:13 +00:00
hikerstk
28cea5f3e6
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 11:20:54 +00:00
hikerstk
4b744e71de
Repository recovery 15: former r14313, r14319
...
Improve the ugly and confusing inside-the-monster part of subsea. Might revisit the textures, they are a little creepy
Make creatures-insides textures more cartoonish and less gruesome
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14327 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 11:08:33 +00:00
hikerstk
3d4664bd89
Repository recovery 9: former r14324
...
Made speed-weighted animations slower. That was part of r14324, but appears
to have been done accidentally. Auria, can you please confirm that you did
this on purpose?
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14321 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 10:08:53 +00:00
hikerstk
71c66d2eff
Repository recovery 8: former r14328
...
Now that the nitro meter no longer features visible marks, adjust back the max nitro amount to what it was before, and restore back the old less easy nitro challenge on XR591
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 10:03:16 +00:00
hikerstk
51b45ed217
Repository recovery 7: former r14326
...
Add speed-weighted rotation to Xfce mouse's propeller
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 10:00:58 +00:00
hikerstk
67f59875bb
Repository recovery 6: former r14324
...
Fix the top of the skybox in lighthouse
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:58:27 +00:00
hikerstk
d81c138e17
Repository recovery 5: former r14322
...
Give nolok his pecial green bubblegum shield. Just like regular bubblegum, the visuals will eventually need to be redone
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:53:46 +00:00
hikerstk
71709729b4
Repository recovery 4: former r14321
...
As suggested by deveee, allow bubblegums in battle mode now that they have defensive abilities.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14316 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:49:22 +00:00
hikerstk
46b19e2e8b
Repository recovery 3: former r14320
...
Ignore all events received during the loading screen. Namely, this means that clicking on the STK window to focus it while it's loading will no longer open story mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:47:03 +00:00
hikerstk
02e93b1e52
Repository recovery 2: former r14317
...
Remove some unecessary logging.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14314 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:45:25 +00:00
hikerstk
0a104ed8b9
Repository recovery 1: former r14315
...
Improve a few hard to drive curves in XR591.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14313 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-28 09:38:57 +00:00
deveee
345f55d6f0
Fixed bug with removing shield without a reason
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14312 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-27 10:07:09 +00:00
deveee
5824a2e942
Avoid scaling attachment which isn't bubblegum shield
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-26 13:07:34 +00:00
deveee
6dd109dab0
Smooth rotating when skidding was stopped.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-26 09:33:41 +00:00
auria
c04396e1c1
Scale bubble gum shield when karts are too large; loosely based uponpatch by deveee
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 22:57:46 +00:00
funto66
ee54d158c2
Speed-weighted objects: negative values for speed-factor and strength-factor lead to the speed and/or the strength of the animation not being affected
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 13:34:18 +00:00
funto66
01f029dad2
Oops - min() which should have been a max()...
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 13:07:39 +00:00
hikerstk
00018ebe68
1) Replaced m_wiimote_max with m_wiimote_raw_maw (default
...
needs to be changed from 90 to 25 for r14301 to work
properly).
2) Some code cleanup (removed global constant).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14305 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 05:25:33 +00:00
funto66
ca23d7623d
Add speed-weighted carpet animation to the GNU kart
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14304 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-24 21:42:40 +00:00
hikerstk
b51f500f8f
Fixed wiimote steering (steering was dependend on
...
roll, i.e. tilting the wiimote forward would affect
steering), #990 .
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14301 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-24 20:55:33 +00:00
hikerstk
effc7049a2
Avoid infinite recursion when a track with looped shortcuts
...
is loaded.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14300 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-24 06:04:22 +00:00
auria
35d3807904
Add missing includes for some recent compilers
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14299 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-24 00:29:05 +00:00
deveee
ca7b0268d1
Some missing files and other warnings
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14298 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-23 17:23:17 +00:00
hikerstk
bba3f85e4e
Reverted accidentally committed patch in r14296.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14297 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-23 11:43:43 +00:00
hikerstk
d157d175e7
Fixed VS 2012 compilation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-23 11:36:31 +00:00
hikerstk
489ac88ff1
Fixed cmake problems (warnings and incorrect compiler flags).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14295 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-23 11:05:53 +00:00
auria
4775e3908c
Name XFCE mouse 'Xue' for the time being. The final discussion on this can happen when Joerg is back, but this is already much better than "XFCE mouse"
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 22:59:05 +00:00
auria
6219ab7150
Edit group, this track no longer is an addon
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 22:49:12 +00:00
deveee
b357de50c2
Stop finish sound while exit from race result gui
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14288 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 19:05:03 +00:00
funto66
831d27efbc
Added "speed-weighted objects" functionality (so that we can have animations whose strength and speed grows with the kart's speed).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14286 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 13:44:08 +00:00
funto66
45d68487f0
Add animation strength parameter control for skeletal animations to Irrlicht
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14285 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 13:31:10 +00:00
funto66
1b76d5d04d
Enable multi-processor compilation on Visual Studio (faster)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14284 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-22 13:28:06 +00:00
hikerstk
401f5caac2
Fixed compiler warnings (forcing int to be true or false or so).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-21 04:32:05 +00:00
hikerstk
41804c99da
Fixed windows compilation (without WIN32_LEAN_AND_MEAN
...
windows will define a macro MAX_PRIORITY, which clashes
with the constant of the same name in http_manaher).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-21 04:29:40 +00:00
funto66
5acd0c23cf
Fix compiler warning in MSVC CMake-generated project files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14280 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-21 02:04:57 +00:00
deveee
6e62e2fe52
Set max number of goals in better place ;-p
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14279 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-18 11:35:34 +00:00
deveee
612d53bfe7
Use smaller distance between rows if there is no place for all entries.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14278 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-18 07:33:18 +00:00
deveee
3da81e3c8d
Minor improvements in race result screen - soccer mode
...
- move displaySoccerResult() from displayOneEntry loop
- don't display more results than it fits in table
- also set max number of goals to 10. playing game to 30 goals doesn't have sense and it's hard to display 30 entries in a half of 800x600 screen.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-17 20:15:12 +00:00
deveee
a0ea14b20c
Minor changes in race result gui - soccer mode.
...
On some resolutions longer (translated) title was drawn on ball image.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-17 11:24:50 +00:00
hikerstk
2da9ab0845
Make the AI handle bubblegum better (esp. using shield).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14274 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-17 05:58:56 +00:00
hikerstk
c6fa95d262
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14273 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-17 05:57:32 +00:00
deveee
ca2a1c3671
Replace a kart in saved grand prix only if this kart exist.
...
We should avoid situation when for example add-on kart was uninstalled. Now when not exist, these karts are random.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14272 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-16 12:48:31 +00:00
deveee
0ce990d5ea
Move hat a little
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14270 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-16 05:15:24 +00:00
funto66
c08ed88188
Add back hat offset for Beastie kart
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14269 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-15 20:59:46 +00:00
deveee
d2ee47bece
Allow to use rubber band when kart is shielded. Why not?
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14268 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-15 19:50:47 +00:00
funto66
f54858039f
Small update of license info for Beastie (coherent with media repo)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14267 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-15 12:06:15 +00:00
auria
c69f290c5f
Remove code in OSX version of irrlicht that's causing more harm than good (compilation errors)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14264 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 23:28:53 +00:00
auria
0e6db301f6
Apply new name for spaceship track. Blame unitrax for this idea!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14262 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 23:26:39 +00:00
auria
54bffc0052
Replace star track with spaceship track
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14260 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 23:09:57 +00:00
auria
e98bee6b3c
New beastie kart
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14258 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 22:43:00 +00:00
yasin-ghannam
2c2be48d49
Added start locations.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14257 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 21:22:09 +00:00
hikerstk
b4ce78b339
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 21:00:31 +00:00
deveee
c452bf9d97
Tabs into spaces
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14255 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 20:25:30 +00:00
deveee
b16973dd8f
Read localized names of the karts in race result gui - soccer mode.
...
Also use one standard color for both cases when red and blue team wins. It looks IMO better, I hope it's not a problem for others.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14254 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 20:19:49 +00:00
deveee
a7d62553f1
Fixed crash in new race result gui in soccer mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14253 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 19:40:10 +00:00
yasin-ghannam
1d1b5c20c5
Soccer fixes. Icon fetching and placement.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14251 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-14 13:27:42 +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
auria
671f4d7441
disable z buffer writes on skidmarks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14248 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 23:36:34 +00:00
samuncle
dbe11ae681
More realistic skid mark
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14247 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 23:12:22 +00:00
auria
30293c5cae
make skidlines a little thicker to account for new texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14246 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 23:10:27 +00:00
auria
3ac48aa6b8
More skidlines graphics tweaks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14245 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 22:58:01 +00:00
auria
55e0e4c074
Small improvements on skid lines
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14244 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 22:51:03 +00:00
samuncle
89d6f9c302
Now we have a better texture for skidmarks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14243 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 22:49:26 +00:00
auria
229f7f199b
Simplify previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14242 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 22:35:20 +00:00
auria
a6a336c94a
Allow skid marks to be skinned (features requested by samuncle, he says he will have a nice new texture coming soon)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14241 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 21:29:55 +00:00
deveee
d8cfc75557
Fixed #1003 . Avoid crash when mask file is missing.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14240 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 15:13:39 +00:00
deveee
69ade056dd
Don't attach a bomb when the kart is shielded.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14239 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 09:33:00 +00:00
auria
0470b885f9
Fix normals
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14238 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-11 23:06:01 +00:00
hilnius
a64f187844
revision not in the gsoc report
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-11 22:29:05 +00:00
auria
f83db7f4e2
Apply rotation and scale on gnu, will make it easier to figure out what is the problem with normals
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14235 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-11 22:25:46 +00:00
deveee
bc6a61bedb
Enable reverse mode in snowmountain and subsea. It was probably disabled by accident.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14232 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-11 18:56:18 +00:00
deveee
dbe81fcc15
Fixed #962 . Remove terrain particle emitter when the kart is eliminated.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14231 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-10 19:14:47 +00:00
auria
893276d3b3
Reduce textures that were uselessly large (full versions kept in media repository, as always)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14230 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-09 23:58:11 +00:00
auria
14c1090323
Add betharatux1's new icon
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-09 23:46:45 +00:00
deveee
0c3f4887de
Move emitters a little. Sorry for the mess.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-09 18:05:08 +00:00
deveee
9514b4ffb3
Fixed waterfall in Sandtrack. Probably regression since r12941.
...
I also added few more emitters in the waterfall. Now it looks little better.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14224 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-09 17:42:53 +00:00
auria
b78c0e89c8
New sound effect for bubblegum shield collisions
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14222 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-09 00:14:08 +00:00
deveee
0183ed8507
Explode rubber ball in non-linear world. Accidentally used in debug mode it caused crashes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14221 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-08 19:19:05 +00:00
deveee
414ad5b24b
Fixed #1064 .
...
Also added separated bowling roll and shoot sounds. Now bowling_roll can be played in a loop.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14219 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-08 17:04:27 +00:00
deveee
9ce3a75377
Don't explode shielded kart which is near other exploded kart.
...
- move it to better place
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14214 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-06 08:38:49 +00:00
auria
67e907fdc3
New XFCE mouse icon by totoplus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14212 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 23:20:57 +00:00
deveee
130f3f42a9
Don't explode shielded kart which is near other exploded kart.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14210 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 20:20:41 +00:00
deveee
535d3c87fb
Fixed regression since r12673. Add-ons were sorting from "z" to "a" in default mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14209 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 19:15:14 +00:00
deveee
c54ee10ffc
Remove subsea from easter egg mode - just delete easter_eggs.xml
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14207 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 16:20:35 +00:00
deveee
ffc640b9a0
Battleisland was defined as add-on track
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14206 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 16:20:13 +00:00
deveee
1d918f0bc4
Move default nitro emitter little higher
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14205 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-05 10:22:17 +00:00
deveee
3a73436d3e
Nitro and skidding gfx improvements
...
- skidding effect shouldn't depend on height of the kart
- workaround for karts which don't have nitro emitters
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14202 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-04 20:08:16 +00:00
deveee
77e7ff57ab
Fixed #1005 - add sound when ball hits non-kart object
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14201 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-04 05:16:18 +00:00
deveee
d7d29dd2b8
Fixed #934 . Wait before ready phase if sounds are disabled.
...
Jingle is actually sound rather than music. Before change it was disabled in preferences by both - music and sfx.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14199 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-03 13:49:56 +00:00
auria
c40a403530
Fix a few minor glitches in subsea, mostly z sorting issues. They were always there, but bubblegum makes them more obvious so may be a good time to fix them. Still more issue remaining.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14195 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 23:39:38 +00:00
auria
b8b843d31c
work around bubble z sorting issues
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14194 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 23:18:10 +00:00
auria
f30af9ecf4
Minor fix to normals in mines, plus change screenshot to one that will be more reckognisable when minimized
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14192 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 23:13:56 +00:00
deveee
9f077693b0
Added nitro emitter to xfce mouse.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14190 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 19:34:36 +00:00
deveee
e5bc243a42
Disable hat also for pidgin because it works wrongly and I have no idea why.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14189 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 18:18:36 +00:00
deveee
19f8aaabb8
Finally fixed christmas hats.
...
- Changed name of bones to "Head" in emule and konqi kart
- Removed hat offset for puffy kart - it disables hat at all. The best would be add option "disable hat" to exporter in blender.
Sorry for these stupid revision numbers. Perhaps exporter has problems with git-svn. I don't know.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14187 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 16:38:19 +00:00
auria
185823a181
fix bubblegum render issues by undoing accidentally committed experiment :-$
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14181 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 01:59:00 +00:00
auria
85880406d1
Update subsea, fixed to avoid a lot of z sorting issues
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14179 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 01:56:57 +00:00
auria
fbf1e46e2f
tweak fonts to make screens sort of fit at very low resolutions
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14178 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-02 00:56:17 +00:00
deveee
a7214699e8
Fixed pause sound when kart is not driving on the bridges in Green Valley
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14172 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-30 08:52:20 +00:00
deveee
4673c41987
Still work on #886 .
...
- fixed resume sound after that when speed was near to 0 (broken in previous commit)
- pause sound while explosion animation
Tested on bridges in hacienda and snowmountain.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14171 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-29 22:19:48 +00:00
deveee
b1c375528e
Partially fixed #886 .
...
There is still an issue when the kart doesn't move. Function isInRest doesn't work well in this case.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14170 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-28 21:53:47 +00:00
deveee
351e75a9e8
Fixed flickering grass in overworld - ticket #1004
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14168 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-28 16:05:59 +00:00
deveee
0c6050fe65
Minor change in my previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14163 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-27 15:58:59 +00:00
deveee
b3cf4ff568
Fixed wall in hacienda - ticket #936 .
...
There are also other objects to fix, but nobody should run there :P
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14160 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-27 13:09:56 +00:00
deveee
7316b2b63b
Fix displaying net - soccer mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14156 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-26 12:44:15 +00:00
hikerstk
3e6b1872e4
Enabled searching in the doxygen documentation (thanks to nixt for
...
finding that).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14155 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-26 00:56:28 +00:00
magned
78632a8ecf
Align Wiimote connect instruction with actual confirm button text, and added link to wiki with detailed instructions (yet to be written).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14154 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 22:44:37 +00:00
deveee
dbd36f47dd
Little change in previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14152 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 18:04:14 +00:00
deveee
ee61e8f52a
Fixed displaying time in race gui and race result - soccer mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14151 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 17:57:13 +00:00
deveee
bc4006cefa
Add BAD badges in soccer setup screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14150 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 16:54:18 +00:00
deveee
947f1876d2
Add OK badges and sounds
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14149 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 16:34:51 +00:00
deveee
2aab049540
Fixed compilation in gcc
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14148 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 16:34:31 +00:00
deveee
4edd9176dd
Both teams should have at least one kart.
...
Still to do: user should be informed that he can't choose this team.
Not tested in more than 2 karts.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 11:57:50 +00:00
deveee
0db9da03e5
Restore rotating after player confirmation.
...
But rotation is done only once to avoid rotating kart in every fire press.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-24 07:03:07 +00:00
deveee
f7d41cf008
Remember last used number of goals value
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14141 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-23 18:17:32 +00:00
deveee
d5bddb20fa
Assign fire key to select in soccer setup screen.
...
This is done in the same way as in kart selection.
Btw. nixt, update rain in final camera is necessary ;-p
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14140 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-23 14:09:25 +00:00
hikerstk
1b2c340875
Disable Easter egg mode in multiplayer for now (see #1047 ).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14139 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-23 07:20:57 +00:00
hilnius
26321be49d
implementing the race vote network communications
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14135 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 20:40:14 +00:00
deveee
fc15d0fd7b
Disable highscores in soccer mode. The same as in 3 strikes battle.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14134 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 20:36:58 +00:00
deveee
cc07c61bff
Larger checkline in jungle track.
...
This solves ticket #1050 .
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14132 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 19:44:26 +00:00
magned
ac72296fd0
New screenshot for Old Mine.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14131 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 18:42:34 +00:00
magned
804be1fb5b
Removed old Sara kart model.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14130 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 16:27:56 +00:00
deveee
148f08ab8f
Correct hat offset for every kart.
...
There is still problem with konqi, elephant and puffy kart - probably hats are not displayed at all.
I can't change these offsets in blend files. There is no option to write it.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14129 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 15:56:30 +00:00
deveee
ec02f2990b
Arrow position should depend on height of the kart rather than position of the hat.
...
Not every kart have/should have a hat (puffy?). A lot of add-on karts probably never will have
defined hat offset. Also hats position is now broken a little.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14128 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-22 08:44:42 +00:00
hilnius
a637ce6e36
some buxfixes + implementation of the max player count
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14127 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 20:56:39 +00:00
deveee
a39a3e0880
Move Christmas hat model to the center
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14125 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 20:53:47 +00:00
hilnius
241a7f63e1
adding comments
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14123 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 18:26:02 +00:00
hilnius
c9cb74a9e5
fixing bugs, adding comments, structures and functions for the map vote system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14122 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 18:18:50 +00:00
deveee
4c7fdb0ccb
Goal text was drawing twice. Leave only global text in race gui.
...
Also add possibility to translate it. Previously was added only string from soccer_world.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14121 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 17:50:12 +00:00
auria
35518d6526
Update ingame documentation for new bubblegum. Update translation files, fixing invalid XML files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14119 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 00:42:01 +00:00
auria
f426a2f31c
Simplify bubblegum code, make it play a sound when exploding and leave a bubblegum pudddle on the ground
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14118 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 00:24:01 +00:00
deveee
1e6425a1cc
Reset clock mode when game is restarted.
...
This solves problem with missing thunderbird.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14117 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 21:38:59 +00:00
deveee
42fd3a2343
Reset position of soccer ball when game is restarted
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14116 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 21:25:26 +00:00
deveee
71bca15228
Fixed ticket #947
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14114 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 19:43:58 +00:00
deveee
6baf56ca8c
Non-master players shouldn't quit the soccer setup screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14113 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 07:43:01 +00:00
auria
f5aaeeb14e
Make bubblegum shield transparent. Still quite ugly but at least bearable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14112 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 00:52:46 +00:00
auria
099bbd27a6
Following (insufficient :P) feedback, tweak nitro minimum usage a bit. More extensive feedback still welcome
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14111 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 00:34:29 +00:00
auria
ce1d886994
Add XFCE mouse kart
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14110 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 00:22:41 +00:00
auria
838fa746a7
Add zoom-in effect on attachements. Required for bubble gum, but looks actually qutie good on others too
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14108 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-20 00:09:06 +00:00
auria
001da20f42
Fix audio master volume bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14107 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-19 23:46:51 +00:00
deveee
8eac1d5971
Fixed small bug in previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14106 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-19 19:11:36 +00:00
deveee
8704ea70e0
Allow push buttons using keyboard/gamepad in soccer setup screen.
...
Also disable up and down arrow for non-master players.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14105 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-19 18:03:06 +00:00
deveee
d25c692cb4
Tabs into spaces
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 19:41:13 +00:00
deveee
c192a431fa
Size and position of team icon in race gui is the same in different resolutions
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 19:37:24 +00:00
unitraxx
0979de10c5
Documentation for CurrentUser and Messages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 18:31:00 +00:00
deveee
82590c791d
In soccer mode the same end camera as in 3 strikes battle
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13699 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 17:37:07 +00:00
deveee
829656d1d7
Move getting team icons to avoid getting it in every refresh.
...
I'm not sure where it should be to keep order.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 10:15:29 +00:00
auria
9301bb41d6
Fixed missing padding issue since skin was modified
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 00:16:28 +00:00
unitraxx
8b6cf84748
Documentation for online requests
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13696 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-16 00:09:38 +00:00
deveee
d4a224cd4e
Place team icon in the same position as kart icon in soccer mode result race.
...
Visually now everything looks good for me :-P
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 20:09:21 +00:00
unitraxx
b0ba070140
HTTPManager documentation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13694 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 19:30:50 +00:00
unitraxx
f836df5eba
More small fixes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 19:16:36 +00:00
unitraxx
a855752f0c
Initial documenting for the profile manager and profiles and some FIXME's fixed
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13692 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 18:08:32 +00:00
deveee
402799a460
Draw team icon in race result
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 13:34:23 +00:00
hilnius
0ce03186ee
merging uni's branch and fixing compilation problems
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 10:12:54 +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
hilnius
5f4270acc6
adding some comments and fixing the kart selection screen bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 09:45:22 +00:00
unitraxx
c775662e4a
fix rfc for achievements when no default profile is selected
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13685 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 22:52:21 +00:00
deveee
ecc27f9d03
First version of race result gui in soccer mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 19:20:08 +00:00
deveee
d0be1fc0a2
Convert tabs to spaces
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 19:19:40 +00:00
deveee
07a3c4f3d5
Minor changes in soccer mode
...
- scoring points correctly
- goal text only on the center of screen, not everywhere
- soccer mode enabled only in multiplayer
- disable rotating after player confirmation - should look the same as in kart selection
- restore master-player-only after back to race setup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 12:08:22 +00:00
unitraxx
99e7b565bc
Password changing done! (and some other small fixes)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 01:07:22 +00:00
unitraxx
f710250867
The account settings tab is only visible when visiting your own profile
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-13 23:22:12 +00:00
unitraxx
503e261a36
A new tab/screen for account settings
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-13 23:02:56 +00:00
hikerstk
bf11fb4076
Updates VS 2010 project files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 23:38:44 +00:00
deveee
3ef3193a7e
Move flying grass to the ground in tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 21:38:46 +00:00
unitraxx
2c1d02095a
Changes to HTTPManager and it's clean-up sequence. Main thread now "joins" the network thread and thus waits for all the requests to be done. (Remember me to start a discussion on the memory leak checker!)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13671 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 18:23:56 +00:00
hilnius
20418a82af
Lot of changes to make a cleaner startup in no-graphics mode and having a clean exit with all threads being stopped etc...
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13669 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 15:54:32 +00:00
unitraxx
e71d99aa2d
small clean up improvement
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13668 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 02:44:52 +00:00
unitraxx
5ba1493990
Some fixes in the sequence of quiting STK. Though the thread still gets killed before the request is done.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13667 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 02:29:05 +00:00
unitraxx
ed37d53be6
improvements regarding save-session (client-side)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 00:29:38 +00:00
unitraxx
90b8f6d0fc
Description of the achievement now pops up when you click on one and some bug fixes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-11 20:25:13 +00:00
unitraxx
fc45d76d27
Special case for viewing your own achievements. (Shows the progress)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13662 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-11 19:23:54 +00:00
deveee
c4f85ccbdb
Tutorial cannot be played in reverse mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13661 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-11 13:08:54 +00:00
deveee
fa70318e11
Update rain also in debug and finish camera.
...
Now everything should work properly.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-11 07:52:24 +00:00
unitraxx
cbca9404e3
Big ass commit regarding achievement viewing of other people via their profile.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13658 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-10 20:41:57 +00:00
unitraxx
095d5a58c1
Core for viewing achievements of others
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13656 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 23:10:36 +00:00
deveee
a38d0f57bf
Update rain while explosion animation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13655 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 20:37:24 +00:00
deveee
25eded2f4d
Revert "Disable rain for Lighthouse due to #972 . This will only be a temporary issue and should go away once cand's stuff has been merged."
...
This reverts commit 4c6cf1fc6b9fd18db6bf29f929cfafe21de50d27.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13654 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 20:00:24 +00:00
deveee
17a0b1848d
Move updating rain below positionCamera(). It solves the problem with diseppearing rain - ticket #972
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13653 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 19:59:13 +00:00
hilnius
0bddb320cd
Adding packet logging + fixing lost packets (that are now kept for 2 seconds while waiting protocols that should receive them to be started).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 19:15:31 +00:00
unitraxx
add8007dcb
Couple of bugfixes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13650 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 15:37:35 +00:00
magned
e3a5c2a889
Disable rain for Lighthouse due to #972 . This will only be a temporary issue and should go away once cand's stuff has been merged.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13649 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 15:02:50 +00:00
hikerstk
d7960cc5bd
Removed regular polling debug output.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13648 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-08 11:20:50 +00:00
deveee
8d89f84a04
Fixes #923 and hopefully doesn't break anything other.
...
Distance cannot be equal to 0.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13647 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-08 09:57:29 +00:00
hilnius
6c9473dc1b
fixing all kind of problems with connection. Now everything works even if weird network configurations (like mine). It might not work behind professional (work) NATs.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13643 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-07 18:49:48 +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
hikerstk
af62f273d9
Fixed VS compilation (why, since we have cmake? Don't ask ... long story).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-06 13:57:15 +00:00
hikerstk
5efb8a0828
Fixed windows compilation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13636 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-06 10:59:07 +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
unitraxx
c67c5a6fb1
Achievements progress now actually gets saved.. how cool is that?
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13634 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-05 23:20:39 +00:00
hilnius
ff8fda6219
cleaning way of stopping the listening thread (now uses a mutex locked/unlocked) Fixed some other bugs.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13633 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-05 20:19:44 +00:00
unitraxx
d6f6383833
While one issue is fixed, another one popped up. Pretty late, I'll look at it tomorrow. (Feel free to have a look ;) )
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-05 02:41:08 +00:00
unitraxx
03be63ea5b
Even more achievements stuff. Unlock manager is a mess!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13630 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-04 19:44:10 +00:00
deveee
b078633eb0
Fixed problem with switching between name and date column.
...
Now everything should work properly.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13629 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-04 16:43:52 +00:00
curaga
0588b4252e
irr: Add support for some RG texture formats
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-04 13:26:06 +00:00
curaga
8f0f150c4a
irr: Fix an extension order mismatch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-04 13:25:24 +00:00
deveee
7282b5052b
Fixed bug in my previous commit.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-04 07:06:02 +00:00
unitraxx
178fc8613d
Moar achievements stuff. Hooks and server stuff still TODO.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-04 01:57:04 +00:00
auria
1f15257c57
Scale down speedometer text when speedometer is small
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-03 23:59:53 +00:00
deveee
d00e0397f3
Improved sorting of add-ons.
...
I added possibility to back to default sorting by click on the head of the column third time.
There is still problem with switching between name and date column.
Code probably could be better. Feel free to improve it.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13621 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-03 20:53:33 +00:00
curaga
cb9017d5e8
Sigh. Yet Another VS Workaround.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-03 08:28:44 +00:00
unitraxx
c0c744b45b
Fixed const iterator issue and something with the string utils.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-02 23:22:10 +00:00
hikerstk
56de36925c
Oops - missing file in previous commit.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13618 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-02 23:14:17 +00:00
hikerstk
991662fc9f
Fixed circular includes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13617 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-02 23:02:15 +00:00
unitraxx
91e77a14c3
Lots of additions to achievements! core almost done.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13616 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-02 20:53:55 +00:00
unitraxx
e21ef8d40b
Combined some file manager methods that had duplicated code into one getConfigFile method. Also fixed compile issues with the achievements stuff. (latter still WIP)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-01 21:11:15 +00:00
deveee
47b8cdf35b
Shoot only one item while fire key is pressed
...
It fixes #953 and #1006 .
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-01 16:02:18 +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
unitraxx
046269cebb
moar achievement stuff
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13612 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-31 02:06:56 +00:00
unitraxx
cd7e986486
Achievements start
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 22:28:57 +00:00
deveee
b5a3ac476e
Added time.cpp to sources.cmake
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 18:46:20 +00:00
deveee
0647c7cd4c
Testing commit
...
Added the same icons which are for Windows - in src/windows_installer/icon.ico.
They have higher quality than previous. I also added icon 128x128 as default.
It looks much better in Gnome 3.x and probably other desktop environmetns.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 18:46:11 +00:00
curaga
d2c468980d
time: include stdio, needed on newer GCC
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:25:13 +00:00
curaga
efe3b59bc5
Rename Time to StkTime, X11 has a type called Time
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:24:12 +00:00
curaga
2a6c1a0a8f
Mark the irr changes that are upstream
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:15:45 +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
curaga
a7b990a49f
The soccer files were CRLF. Mark as native.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:12:23 +00:00
curaga
fe9d2ec86c
Mark the main clean function static
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 11:39:40 +00:00
curaga
4c0b875f9a
Resize the overworld splatmaps to 128x128
...
Not touching media as I have no media checkout.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13599 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 09:22:30 +00:00
hikerstk
074ef2237d
Fixed compilation errors (left over references to file that was
...
removed).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 04:39:51 +00:00
magned
592dacf391
Removed track alpha-planetarium from trunk.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 01:52:12 +00:00
magned
e06bdc4e0e
Added new icon for 'Expert' difficulty, and renamed 'Iron Man' difficulty to another stolen name. ;)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 00:24:45 +00:00
hilnius
50db118a91
fixing usleep unistd include
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-29 17:59:56 +00:00
hilnius
71fb252654
removed some useless files + improvements in end-race GUI interaction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-29 17:57:56 +00:00
unitraxx
7e8d167a89
Decent clean-up when closing STK. Send a message to the server if still signed in. (Server-code will not be pushed immediately, so testers might experience errors.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 22:45:11 +00:00
hikerstk
298bd078fb
Applied Deve's patch for #1042 - thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:58:45 +00:00
curaga
3125886dac
High-priority log events always go to console
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:51:38 +00:00
curaga
97232fe314
Invalid params should go to console
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:51:12 +00:00
curaga
c353dc1013
Don't pass NaNs to OpenAL
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:50:20 +00:00
hikerstk
abef4345c5
Fixed typo (which only happens when compiling with wiimote).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 11:59:40 +00:00
hikerstk
dadca72349
Fixex VS compilation: need to link with Iphlpapi.lib,
...
and apparently 'interface' is reserved (or #defined) in VS.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 06:52:11 +00:00
hikerstk
de14757419
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13582 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 03:39:44 +00:00
hikerstk
c940616909
Fixed compilation on linux.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 03:36:51 +00:00
hikerstk
ffb2ee7c22
Replaced usleep (which isn't available on windows) with new
...
custom function in Time::. Replaced calls to irrlicht's
device's sleep function (since it can cause a crash if the
device doesn't exists, which can happen when a thread calls
device->sleep while changing screen resolution).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13580 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 03:17:44 +00:00
unitraxx
e0e8dff768
Last bug filtered out!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13579 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 00:23:31 +00:00
unitraxx
c24bdc66bd
Fixed some holes and other improvements.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13578 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 23:24:25 +00:00
hilnius
8233b8067d
merging uni's and trunk branches. Not everything tested right now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 01:02:41 +00:00
unitraxx
217ec5ce9c
Lots of improvements, mainly related to login (dialog)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13576 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 00:07:29 +00:00
hikerstk
1591eb4126
1) Bugfix: member variables where accessed after deleting this
...
2) Removed unnecessary member variable, some code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13575 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 23:02:06 +00:00
hilnius
93ec81f309
now to know the public ip address, the GetPublicAddress protocol uses randomly selected STUN servers from the UserConfig file. If the server doesn't answer after two seconds, the protocol will reset and pick a random server again.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 14:14:52 +00:00
unitraxx
fe85a75036
small fix for polling result
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13573 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 14:06:19 +00:00
hikerstk
74c819fd8d
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13572 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 13:27:03 +00:00
hikerstk
c2e11c5783
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13571 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 13:24:58 +00:00
hikerstk
7b970b643a
Added (somewhat experimental) code to detect the local
...
IP address on windows (and to discover if 127.0.0.1 can
be used to connect to a client on the local machine).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13570 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 11:09:39 +00:00
hikerstk
96c04daa6a
Fixed VS compilation error.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13569 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 11:07:20 +00:00
hikerstk
d08583b19f
Applied same patch from hilnius branch to fix compilation (to
...
avoid conflicts when merging later).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13568 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 04:38:05 +00:00
unitraxx
616fc2b5be
dialog bug fix
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 00:06:30 +00:00
hikerstk
ee8ec31e62
Fixed VS compilation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13564 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 23:37:12 +00:00
unitraxx
5fa970b517
Fixed registration dialog bug and changed event checking in online screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 23:22:28 +00:00
hikerstk
ce67d78d1e
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13562 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 13:24:49 +00:00
hikerstk
9896c7ae3b
Fixed usage of usleep and round for visual studio.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13561 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 12:02:18 +00:00
hilnius
ff1ef8b0b6
addded a List UserConfigParam and a StringListUserConfigParam that contains a list of STUN servers (to avoid hard-coding the STUN server domain name.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13560 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-24 16:47:56 +00:00
unitraxx
b3a905dcc2
Related to previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13559 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-24 00:06:36 +00:00
unitraxx
f9f4047155
Glitch fix
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13557 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 23:47:48 +00:00
unitraxx
2ee5a1b188
Small adjustments to the notification and user info dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13556 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 19:53:03 +00:00
unitraxx
639d79fa10
Some general improvements. There is still a bug somewhere that on rare occasions triggers an assertion when signing in.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 19:37:39 +00:00
hilnius
39a0e7a67e
fixed a bug in the algorithm that sorts players at the end of the race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13554 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 15:14:56 +00:00
unitraxx
bfc32bdd14
Remove friend and cancel request added in the client. Server-side still need to be implemented.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 00:49:46 +00:00
unitraxx
ed7b4b875a
Some dialog queue improvement.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 16:57:04 +00:00
curaga
c96bd8d64e
Make gum_shield.frag compile
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13550 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 15:44:56 +00:00
curaga
5d7e846969
Parallelize SFX loading, 7% speedup in load time
...
Vorbis and AL are thread-safe.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13549 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 15:43:24 +00:00
curaga
138d61554c
irr: Add support for non-triangle VBOs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13548 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 15:42:02 +00:00
curaga
6b46c2bed7
irr: Add a more specific ortho matrix creator
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13546 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 15:40:02 +00:00
unitraxx
5ada92b251
Cache issues fixed.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13545 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 15:35:40 +00:00
hikerstk
ebea0a49f9
Merged soccer branch with trunk, fixed (at least some) tabs
...
usage.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13543 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 03:54:52 +00:00
hikerstk
8ec6b13eee
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13542 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 03:50:50 +00:00
unitraxx
136185969f
Another bugfix (Todo constraints and cache issues)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13541 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 02:25:08 +00:00
unitraxx
225994df55
Small sequence fault in setting the error color, when a server mistake occurs.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13539 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 01:50:39 +00:00
unitraxx
ff877b60ca
And you now get immediate notifications for new friend requests! (easily extendable for future personal message notifications)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13537 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 01:22:09 +00:00
unitraxx
c3c1e1b054
When someone accepts your friend request while you are online, besides the notification, the status in the friendlist gets also updated.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13536 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 00:43:53 +00:00
hikerstk
35b58661e5
Minor cosmetic changes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13535 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 00:00:40 +00:00
hilnius
8e7338a13e
game no longer crashes at the end of the race, the end of race sequence seems ok for 1 player at least
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13532 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 19:04:46 +00:00
hilnius
e3261775e3
forgottent commit on former computer
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13531 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 13:54:50 +00:00
unitraxx
1f45958323
Fixed some iterator issue and a bug in the notification messages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13530 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 01:15:00 +00:00
hilnius
92667d4bba
fixing skin little error with some links to glass remaining
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13528 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 00:31:39 +00:00
unitraxx
fc789d6b3d
When you ask someone to be your friend, it now shows immediately in your friends list. (as pending of course)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13526 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 00:06:13 +00:00
unitraxx
72a3015e1a
Dialog screens now pop up when a friend comes online ! hurray
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13523 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-20 20:58:34 +00:00
unitraxx
a4bb17d2ca
Some bugs/things I forgot
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13521 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-20 18:13:52 +00:00
unitraxx
8e6495139e
Related to previous commit. Changes to the modal dialog core. (Not 100% sure if every dialog still works.) Some core changes to profile, profile manager, and the related callbacks for friending.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13520 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-20 17:36:20 +00:00
unitraxx
445706793e
Big commit. Everything related to friending & friendslist GUI, dialog queue and callbacks for the 3 requests.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13518 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-20 01:10:07 +00:00
unitraxx
d40dd67e96
Some additions to some stuff. Mostly the profile manager, where I've added a separate queue for persistent profiles. (I.e. the current user and his friends.) We should definitely put a max on the number of friends. (Pretty low, and remove the limit for premium ;) )
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13515 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-19 19:31:50 +00:00
unitraxx
f43c5c915f
GUIEngine addition. Now a queue of dialog windows.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13514 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-19 18:08:51 +00:00
unitraxx
ac6ce5a4f0
Cleaning up some obsolete code.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13513 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-19 16:24:15 +00:00
unitraxx
ea7d42c1b8
Friendslist gets automatically fetched after signing in. And some general bugfixes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13507 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-19 00:19:18 +00:00
unitraxx
c758ecbe43
Polling timer depends on whether you're in game or in menu.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13506 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 23:46:36 +00:00
unitraxx
0c4780a39e
Auto signing in, happens in the background on startup now.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13505 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 23:42:44 +00:00
unitraxx
2428a5f3b0
CurrentUser is now linked to a profile. Thread safeness obsolete, so removed. User class deleted. Adapted hilnius' code to conform.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 22:59:23 +00:00
unitraxx
37f3f55da8
Face one of the refactoring! callbacks on http requests get now called by the main thread. So absolutely zero thread-safety has to be taken care of, outside of HTTPManager and its requests.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13503 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 22:22:00 +00:00
unitraxx
17b9479fce
Quite the mess I'm committing, but it's kind of a back up for the massive refactoring I'm about to do now. It will be great! (hope so)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13502 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 21:08:27 +00:00
unitraxx
70bb8df317
Start of the GUI additions. Need some refactoring first.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13501 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 14:54:41 +00:00
unitraxx
9003af59e1
Additions to user memory mananegement in cache. Added the add, accept and decline friend core to the client.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13500 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 14:31:38 +00:00
yasin-ghannam
a400e48c57
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13499 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 12:43:19 +00:00
yasin-ghannam
43f8963a01
Goal SFX added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13498 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 12:25:08 +00:00
yasin-ghannam
51a7b2b387
Goal scoring corrected. "GOAL!" appears when a goal is scored (Music will be added soon). Karts start positions fixed so that each kart faces the goal of the opposite team, not its own.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13497 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 07:36:32 +00:00
unitraxx
66c9c1fac7
More info shown now in the friendslist. Client now knows when a friend request is pending etc.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13494 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-17 21:39:51 +00:00
unitraxx
f0cf45b9b4
Client core for relationship info.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13493 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-17 20:22:55 +00:00
unitraxx
05a495810e
Some general useability improvements
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-17 00:27:35 +00:00
unitraxx
0f0caf5f35
Lots of changes. When you click a user name now (in friends-list or search result), you get a pop-up, where you can click to join and watch the profile.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13490 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-17 00:11:03 +00:00
unitraxx
8e530bd505
Small additions from the lost commit. (Also pushed the search files to the server, which apparently I didn't)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13489 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-16 15:55:43 +00:00
unitraxx
10600e94f9
Memory management in friends fetching back ok. Something weird happened with my commit this morning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13488 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-16 01:19:12 +00:00
unitraxx
c8df03e7ce
first SSL layer
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13487 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-16 01:11:19 +00:00
hilnius
98f3b20bcb
merging uni's branch and trunk
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13485 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 12:35:23 +00:00
hikerstk
05c47f83ca
Fixed compiler warnings, layout, and removed tabs.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13481 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 05:57:48 +00:00
unitraxx
eb1bd40c0c
small update to the friends fetching. The server request deletes itself in its callback.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13480 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 01:51:21 +00:00
unitraxx
c15f5537d4
Textbox border change. GUI changes accordingly. Checkbox in login dialog isn't properly aligned though.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 01:24:49 +00:00
auria
9f0bc16ebf
Make text boxes perfectly respect the allocated size
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13478 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 00:36:25 +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
stephenjust
2373f4f053
Add certificate file for tuxfamily - still need to make sure it's installed
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13476 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-13 23:18:08 +00:00
auria
9fb7593efe
Remove accidentally committed debug test
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13474 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-13 00:41:00 +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
auria
614e7893c0
Improve layout so that buttons are contained within the allocated space. Delete old glass skin.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-13 00:17:31 +00:00
unitraxx
c1e36b02de
User searching! Very close to adding friends now ;)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-12 23:58:22 +00:00
curaga
c90954ee51
irr: Add texture override support
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13466 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-12 12:47:02 +00:00
curaga
04d5903f57
irr: aabbox intersection support
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13465 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-12 12:46:10 +00:00
samuncle
4ac3f6f728
I added subdivisions to the river for cand to help shadow algo
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13463 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-12 09:46:00 +00:00
unitraxx
b2a0198c34
Small fix in server selection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13461 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 21:39:36 +00:00
unitraxx
c687151d11
Stable version of profile where your friends are actually showed with their username in a small list.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13459 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 19:47:25 +00:00
unitraxx
098b191e9e
see previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 17:24:36 +00:00
unitraxx
c8eea98342
The actual fetchitng and showing of your friends in the friendslist
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13456 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 01:22:27 +00:00
unitraxx
d8734acbe6
Profile fetching implementation as cache
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13455 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 00:59:10 +00:00
auria
91e1fb3111
Minor tweak so that a single nitro buttle is fully consumed when using the nitro button (before, there would be a very tiny little amount left)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13454 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-10 00:55:27 +00:00
auria
9d05adbacf
Fix bug #1037
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13453 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-10 00:51:44 +00:00
auria
b72f0bf625
A few small tweaks to soccer mode, show message when a goal is made, resize down soccer ball a little
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13452 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-10 00:23:51 +00:00
auria
d3e6569a54
merge soccer branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13450 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-09 23:48:13 +00:00
curaga
8eaabdb77b
Move the spot to the front
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13449 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-09 18:33:38 +00:00
curaga
38accf6205
Up the kart selection screen ambient light
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-09 18:33:16 +00:00
hilnius
23dba6ec0e
lan works now automatically. needs a fix for windows
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-09 18:21:14 +00:00
samuncle
d58e16c338
A basic shader for the bubble gum shield effect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13445 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 03:59:15 +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
unitraxx
aa5c5a9f6b
Ok client-side everything now works perfect for addon voting. Be sure to use the new config file and change to server_addons= http://downloads.tuxfamily.org/stkaddons/assets-uni/xml if you want to test
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13440 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 00:42:35 +00:00
unitraxx
c111165703
Halfway friends list fetching. (Yeah it's quite a mess atm.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 00:19:11 +00:00
unitraxx
b0ff13299c
GUI work for profiles. A common inherited base screen for the different tabs. Friends screen added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13434 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-07 15:03:33 +00:00
hilnius
d265c7e7be
adding code to synchronize also hits on bananas
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13433 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-07 12:48:16 +00:00
hilnius
372689f0bb
fixing multiple bugs in item selection events protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-07 12:32:38 +00:00
hilnius
367892e055
working powerup synchronization (not tested but should work ;p)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13428 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:46:15 +00:00
hilnius
7bf6b3cc25
removing a mistake that was making karts not do item checks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13427 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:38:57 +00:00
unitraxx
bf5eccf4ed
Some nice optimization update to the rating widget. The calculation of the stars was quite weird?
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13426 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:17:00 +00:00
unitraxx
366ae7009d
Lots of stuff. Mutex optimization. Addon voting. Some profile stuff continued. Progress+++
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 22:45:33 +00:00
hilnius
149875d83c
moving some code to make the server execute it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:59:19 +00:00
hilnius
67c2cb2395
fixing a problem in the server lobby room protocol (that bug had been introduced some revisions ago
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:44:25 +00:00
hilnius
46c994f6fb
fixing a problem in the server lobby room protocol (that bug had been introduced some revisions ago
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:42:41 +00:00
hilnius
9e77350108
adding small debug info
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13420 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 19:16:27 +00:00
hilnius
9151770aa0
fillig the GameEventsProtocol with events that concern powerup collect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13419 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 19:10:33 +00:00
yasin-ghannam
a3be77aa30
added above team leader's head a red/blue ball to indicate team.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13418 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 03:30:42 +00:00
hikerstk
72a2b69695
1) Moved header and source file into the same folder for VS.
...
2) Fixed using/building WIIUSE on VS when created from cmake.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13417 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-05 06:10:31 +00:00
unitraxx
856a21a47e
start of profiles
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13416 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-05 02:03:33 +00:00
unitraxx
757d9e3683
Some general dialog improvements
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13415 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-04 13:33:14 +00:00
unitraxx
63e927b277
Responsibility shifting for the deactivated case
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13413 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-03 01:58:29 +00:00
unitraxx
40de2f62ae
More rating bar and addon voting geniousness (server-side still needs update)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13412 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-03 01:54:39 +00:00
curaga
a3bfed004e
When you click the video slider, the slider text needs updating
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13410 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 14:18:11 +00:00
curaga
144c5cc0b4
The custom gfx tooltip must be updated when the slider is
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13409 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 14:17:34 +00:00
unitraxx
6198c43728
Awesome rating bar widget is awesome
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13408 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 02:25:58 +00:00
unitraxx
ed689232e0
Quick commit to save my progress as my internet connection is clearly unstable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 01:28:50 +00:00
hilnius
9ec58bbcb1
working karts online selection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 23:28:21 +00:00
hilnius
55bd9e18fd
lot of code refactoring, now protocols can choose whether they receive network messages (and more generally events) in a synchronous mode (along with the main loop) or in an asynchronous mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13404 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 19:55:09 +00:00
hilnius
b394bd9295
lot of code refactoring, now protocols can choose whether they receive network messages (and more generally events) in a synchronous mode (along with the main loop) or in an asynchronous mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13403 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 19:49:57 +00:00
hilnius
a51f7bfb74
modify the race_id management to ensure that we always have ids between 0 and the number of players
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 11:51:23 +00:00
hikerstk
3187937496
Simplified #includes, and changed order to follow our style guide.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13401 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:11:10 +00:00
hikerstk
f9fa721a22
Minor bugfix: if an invalid kart name was specified on the
...
command line, it was not ignored (as stated), it would
result in STK aborting. Now this is just ignored.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:06:09 +00:00
hikerstk
5efa7c8ad2
Removed apparently unnecessary #include <io.h>, since
...
it will actually include io.h from wiiuse, not the
internal one from VS (which results in some warnings
about RAD_TO_DEGREE already defined).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13399 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:02:44 +00:00
unitraxx
f4c7cf439e
Fixed a small issue. The main issue is still the bad allignment of the widget though.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13398 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 01:04:51 +00:00
hilnius
057c8f46be
adding things in order to be able to leave the world at the end of a network race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 01:03:07 +00:00
unitraxx
a4c5c4b8ec
Some advancements with the addon voting
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 01:02:35 +00:00
unitraxx
9a4c93f2de
Implemented a callback listener for the login dialog. Added a vote dialog for addons.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13395 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-31 20:47:06 +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
samuncle
db1a05cb87
A better texture for the dress and gloves
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13393 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-31 17:38:05 +00:00
hilnius
1b5c6fd804
merging trunk
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-31 17:06:15 +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
hikerstk
57183584ff
Fixed VS compilation, and sorted includes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 13:04:29 +00:00
auria
79d4c5e52e
minor tweak to checklines
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13387 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 01:45:02 +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
hilnius
bcd15a8851
now network GUI interacts properly with the server, can go up to the selection (still cannot ask for selection)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 23:43:28 +00:00
hilnius
840faec44b
missing include
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13383 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 15:30:17 +00:00
hilnius
8a79bbadfd
better control of events to leave the server properly if the user is in the kart selection phase and decides to leave
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13382 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 15:27:25 +00:00
curaga
57e692c61c
lightbeam: Remove unused uniform, add some spacing
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13381 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 14:41:13 +00:00
curaga
b4cd5e4ec9
Fix the lightbeam shader's inconsistent style
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13380 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 14:40:42 +00:00
curaga
c6f22508e1
irr: RTT flipping workaround
...
Didn't find the cause of this bug, but merely a workaround that only works for STK.
Still, that's two days of searching, cutting my losses.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13379 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 14:40:13 +00:00
hilnius
ad18d9299d
fixing last issues with the inherited kart selection screen : the screen is now deleted when back is pressed, and re-instantiated when it's loaded again. If not, there was a problem with two screens instantiating the same '.stkgui' file. The screen is not deleted when the user clicks a kart (eg when starting normal game) to allow a working popScreen()
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13378 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 12:42:21 +00:00
unitraxx
8c1d84ce74
Some fixes to my GUI Engine additions, so that they are compatible with the rest of the game.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13377 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 19:31:17 +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
unitraxx
6699284237
Some preparations to make the merge with the addons' network manager go smoothly.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13374 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 14:11:20 +00:00
hilnius
79c5fc03e9
moving class declarations of objects used by the KartSelectionScreen to kart_selection.hpp
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13373 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 12:28:26 +00:00
hikerstk
eed1c88b4c
Merged r13349 from trunk, which fixes creation VS project files from cmake.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13371 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 05:24:59 +00:00
hikerstk
151535cc79
Fixed VS compilation errors and warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13370 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 05:22:02 +00:00
hikerstk
cea8482845
Merged r13349 from trunk, which fixes creation of VS project files with cmake.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13369 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 02:03:06 +00:00
hikerstk
5efcb986e4
Fixed VS compilation (mostly by including winsock2.h before libcurl).
...
Also replaced binary numbers (non-standard) with hex numbers, and a few
minor cosmetic changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 01:28:14 +00:00
hilnius
f3b03488c4
as always had forgotten to add the new files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13364 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 23:13:34 +00:00
hilnius
b737ad753a
adding a way to have a network kart selection screen inheriting the normal kart_selection_screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 23:13:03 +00:00
unitraxx
4091c4c965
Recovery dialog finally added. Some additional GUI changes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 20:55:10 +00:00
hikerstk
6441c4548c
Fixed typo(??) in list of sources.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13357 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 23:49:08 +00:00
hilnius
0f469cd3d9
fixing server joining issues
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13356 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 23:47:43 +00:00
hilnius
8c6c1d2c4d
adding forgotten files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 13:02:35 +00:00
hilnius
3e0fcb6d00
adding possibility for the server to decide when to start the selection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13354 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 12:49:05 +00:00
samuncle
f09344fca6
Small correction to the animation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13353 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 16:20:59 +00:00
unitraxx
328e186014
Small bug fix + removing the private user state getter
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13352 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 14:53:25 +00:00
unitraxx
ea11bfa725
CurrentUser doesn't use acquire and releqse anymore. Mutexes added to the members.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13351 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 14:01:20 +00:00
samuncle
b40b4d8652
Small correction for SSAO tests
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13350 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 12:26:24 +00:00
hikerstk
12deb466be
Fixed several problems when createing VS project files with cmake:
...
1) gcc flags were used, and -Wall for irrlicht caused 1000's of
useless warning messages.
2) Force static build of irrlicht.
3) Remove unnecessary dist target (which is unix only).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13349 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 07:19:30 +00:00
hikerstk
2d504379ca
Removed reference to logging stderr (which is not done anymore).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13348 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 07:13:36 +00:00
hikerstk
6c210a8c09
Added assert to Log::fail so that a debugger breakpoint can
...
be triggered. Added Log:: calls to string_utils.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 07:12:49 +00:00
unitraxx
261957bf72
acquire/release approach removed for ServersManager. Added MutexLocker to synchronised.hpp. CurrentUser will folow after sleepy times.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13346 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 02:22:53 +00:00
hilnius
d95065b685
quick join now works.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13345 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:40:52 +00:00
yasin-ghannam
a908f4d3f9
Game ends when goal target is reached.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13344 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:25:35 +00:00
hilnius
87e9deea78
established back login from command line
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13343 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:21:03 +00:00
hilnius
cc2a967969
adding back some things in uni's code that i had removed for debugging
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13342 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:14:22 +00:00
hikerstk
bb249d1681
Made lock/unlock const.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13341 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:10:16 +00:00
hilnius
1ebfd0ada4
fixed server connection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13340 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:07:42 +00:00
hilnius
ddc9e8d5ba
update
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 00:26:44 +00:00
auria
dfb9de9733
Apply parts of patch by Deveee to better indicate new nitro consumption rules, with additions by myself for the race GUI
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13338 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-24 23:14:22 +00:00
hilnius
c5c6c6195f
merging uni's branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13337 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-24 15:43:54 +00:00
unitraxx
aba6b9f0e6
add a synchronousRequest option to the HTTPManager
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13336 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-24 13:08:45 +00:00
unitraxx
0979eb009c
WillemS had a compilation error concerning the namespace os of irrlicht. Tried a fix, waiting for confirmation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13335 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-24 12:53:19 +00:00
unitraxx
85579c3d9b
Client-side code related to previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13334 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 23:54:55 +00:00
auria
27a1509532
Allow navigating with TAB in menus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13332 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 22:53:21 +00:00
unitraxx
7bd614ab12
Registration process fine-tuned. Using icons now and the asynchronous layer. Still TODO : activation and recovery.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 22:29:05 +00:00
hikerstk
f6685af2e1
Added support for looped jumping animation; renamed
...
begin/end_jump to jump_start/end to be more consistent.
Added a test loop to Sara's animation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13330 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 22:11:12 +00:00
unitraxx
a632aca9c9
Some "create server" improvements in both screen and flow. Creating one doesn't actually let you join the server, but pops up the server info dialog of it, which gives you the option to join.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13329 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 20:58:24 +00:00
curaga
8c406172cf
Remove kart selection flicker
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 18:53:12 +00:00
curaga
0157e83fe9
Much nicer kart selection light
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13327 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 17:06:51 +00:00
unitraxx
cdab5caf35
Replaced all non-related GUI code actions done after a reply to request callbacks. Servers manager now allows getting by ID and sort index.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13326 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 16:34:38 +00:00
unitraxx
182cd15477
Fixed the bug in rejoining a lobby. Added a lot of mutex stuff, which wasn't actually related to the problem at all.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13323 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 01:37:49 +00:00
yasin-ghannam
b53e0c4fe3
Slight modification to score display.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13322 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 23:07:45 +00:00
hikerstk
729fb64cb0
Added support for animations without a loop part (esp. jump).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13321 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 22:04:33 +00:00
unitraxx
311fb7bf4b
Fixed reloading bug in server selection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 20:00:08 +00:00
yasin-ghannam
2ac90980d6
Hat offsets added to kart.xml for all karts.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 18:02:33 +00:00
yasin-ghannam
88b6b4b5c4
Kart positions fixed. Karts on the same team appear on the same side.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 17:50:39 +00:00
hilnius
66b4724a76
fix a bug that appeared when starting a normal race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 09:38:04 +00:00
unitraxx
bf2d907ccf
small fixes to let server joining work. (temporary version though.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 00:23:42 +00:00
unitraxx
20e6fe74b2
server creating and joining. (server side code not complete)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13313 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 23:30:04 +00:00
unitraxx
c2159306e8
Some documentation and thread-safeness. ___Remind me to ask some questions about mutex___!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 20:26:27 +00:00
unitraxx
8360c06b15
Deprecated old internet access method. Adapted my servers_manager and users to the new system.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 17:41:02 +00:00
hilnius
84a2df059b
adding rotations to the kart updates protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 15:34:16 +00:00
unitraxx
af12be28fa
Login dialog can't be closed now during a sign in request.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13308 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 15:25:17 +00:00
unitraxx
1cdad60b17
Another enhancement for my HTTPManager which needed a lot of changes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 15:21:48 +00:00
unitraxx
dea145952b
Apparently the onEscapePressed callback for a dialog didn't operate as advertised. I fiex.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 15:19:15 +00:00
hilnius
a4a3e486d1
modifications that were done on server
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13305 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 14:03:36 +00:00
hilnius
0de91b3612
working protocol for controller events
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13304 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 14:00:46 +00:00
unitraxx
3a630d4985
Some memory management
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13303 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 01:17:00 +00:00
unitraxx
e84159f0c9
Made a response queue for the http manager. Adapted everything to use it. Enhanced registration process. Loading messages use the global timer.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13302 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 00:47:48 +00:00
hilnius
b206aeb0bc
adding log to debug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13301 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 00:17:45 +00:00
hilnius
3bf42045f6
correcting a bug in the controller events protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13300 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 23:07:15 +00:00
yasin-ghannam
d314ee2d0d
Team indicators added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13299 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 20:34:37 +00:00
hilnius
38f32b14cc
adding protocols for game events (still not written) and controller events (partially written)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13298 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 17:32:23 +00:00
unitraxx
eafcbc7103
Client side checking for the client and deactivating actions during sign in request.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13297 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 15:52:59 +00:00
unitraxx
4a96c67697
Added method to check if a widget is active or not
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 15:46:25 +00:00
unitraxx
e065870037
Server joining and creating is now asynchronous. Enhanced LabelWidget to use (error) colors.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13295 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 14:21:17 +00:00
unitraxx
ac40b8111b
Decent killing of the network singleton and thread.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13294 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 02:14:36 +00:00
unitraxx
ebc3696de1
Signing out is now also asynchronous. Made the extending of the requests easier.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13293 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 01:38:44 +00:00
unitraxx
8c9834a236
Automatically signing in, is now very smooth.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 22:41:54 +00:00
unitraxx
54333c17b0
Fix. Asynchronous calls can now have callbacks. Thead-safeness improved.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13291 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 22:12:36 +00:00
unitraxx
ad198a6e70
Temporary commit so that I can easily revert if shit goes down. And it will go down. Thread callbacks madness!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 21:20:32 +00:00
hilnius
07d0e5560b
server changes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13289 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 16:09:32 +00:00
hilnius
5c3251e797
stupid pointer not initialized error made the server crash when a second person was connecting to it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13288 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 16:04:44 +00:00
hilnius
2567602ef3
adding address printing debug info
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13287 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 15:36:52 +00:00
hilnius
1940387f9a
adding info to debug easier
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13286 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 15:18:08 +00:00
hilnius
2574c28c5c
fix to avoid the lag
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13285 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 14:40:32 +00:00
hilnius
68336bdcdc
increased the update rate to let the game be playable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13284 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 14:18:21 +00:00
hilnius
c6ef045f2a
had forgot to initiate the btTransform
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13283 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 14:15:13 +00:00
hilnius
4c14995c72
fix to move karts for real
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 13:46:17 +00:00
samuncle
8b600318c0
Test kart for the dress animation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 03:07:14 +00:00
unitraxx
ae6bc57b95
Added Server and ServersManager to the online namespace and edited everything that uses those.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13279 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 23:02:18 +00:00
auria
ec4c55de73
Move nitro min consumption to kart properties
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13278 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:58:40 +00:00
auria
7afaad013a
Reduce minimal nitro consumption a little, I think I was too harsh in previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13277 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:49:38 +00:00
unitraxx
8ec5adeec0
Signin in now fully uses asynchronous http requesting. Implemented a nice "loading dots" gimmick for loading.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:49:19 +00:00
auria
bfad6cc851
Use a required minimal amount of nitro each time the key is used. May need some playtesting to balance but the base is there and shouldn't penalize normal use
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:46:46 +00:00
unitraxx
3724fc3dae
First working version of asynchronous http requests. It's still a mess! Renamed some files and made use of an online namespace.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13274 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 21:18:40 +00:00
hilnius
cd063a8eb2
moving log to more relevant places
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13273 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 18:04:47 +00:00
hilnius
3327e609c6
stupid mistake in a line was making everything bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13272 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 17:56:32 +00:00
hilnius
97891cd5ef
fix a bug that was making the position updates protocol do too much updates (normally it's 1 per second
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13271 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 16:37:40 +00:00
hilnius
b9bf6b9e12
more debug info
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13270 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 16:29:27 +00:00
hilnius
28241f66b2
adding variables to debug easier
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13269 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 16:13:10 +00:00
hilnius
176c175206
dually enhanced thread protocols management to avoid protocols asking their own deletion multiple times (which of course causes a segfault)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13268 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 15:58:46 +00:00
hilnius
ea1c6947ab
adding more thread-safety
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13267 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 14:20:09 +00:00
hilnius
8edf1b6f9e
trying to fix a bug concerning the state modification during asynchronous messages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 13:55:42 +00:00
hikerstk
2ff62c4d97
Added support for jump animation, which will triggered
...
if either the estimated jump duration is long enough,
or the texture the kart was on before it jumped has
a jump property set.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 07:24:47 +00:00
auria
8f77aac50a
Apply small patch by lennartack to fix leak in --no-graphic mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13264 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-17 22:37:45 +00:00
hilnius
93bad9b586
fix a bug that made the server crash during an assertion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13263 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 22:50:00 +00:00
hilnius
75e75c43ee
adding a workaround to be able to start a network client from a server (with --no-graphics option)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13262 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 22:27:28 +00:00
hilnius
766f9dfe70
correcting some bugs in the kart position update protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13261 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 15:00:49 +00:00
hilnius
ddae296064
had forgot the important files in last commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13260 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 14:46:54 +00:00
hilnius
3be0d70ce0
adding a protocol to update positions over network during a race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13259 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 14:45:48 +00:00
hilnius
9e712c87b7
finally when a game starts online the online player karts are set-up successfully
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13258 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 12:50:59 +00:00
hilnius
0625379706
slight modification in the synchronization protocol to handle correctly multiple clients on the server (token management was not working).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13257 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 23:28:20 +00:00
hilnius
e139380a59
cleaning the logs now everything works. Now a player can connect to a server, select a kart (all in console), and the server can start a game. The game starts on clients when the server tells it.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 16:50:17 +00:00
hilnius
d6618969f4
there was a stupid operator<< instead of >> in network_string. That explains other bugs that happened (32-bits words were truncated to 8-bits)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13255 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 16:44:19 +00:00
hilnius
f2d11aa425
really weird bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13254 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 16:23:02 +00:00
hilnius
9bf6dde4f3
improving synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13253 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 16:10:50 +00:00
hilnius
dec7a74c99
fix a bug in asynchronous protocols update management
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13252 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:58:08 +00:00
hilnius
ec65fb96aa
synchronization protocol double/int conversion error fix
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13251 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:44:21 +00:00
hilnius
dc3b5fe35c
correcting a bug in events propagation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13250 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:32:36 +00:00
hilnius
e954bde7ee
more debug info in console
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:06:11 +00:00
hilnius
1d1728553d
switching timer count to double instead of int
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13248 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:00:59 +00:00
hilnius
83d64e6fc2
adding log
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13247 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 14:50:28 +00:00
hilnius
3bb6122f8e
modifying the protocol system to have bon synchronous and asynchronous updates (required by gui and graphics to avoid crashes because of threads)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13246 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 14:31:14 +00:00
hilnius
72dd260bd1
fix on the countdown
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13245 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:53:47 +00:00
hilnius
4134f65dd7
a player can now start an online game. synchronization should work now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13244 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:50:39 +00:00
hilnius
13aa1d52c8
fix a blocking infinite while
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13243 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:44:17 +00:00
curaga
9dc33d1d90
Move the no-trust fps counter check lower, so it only flickers once, not twice
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13239 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:17:05 +00:00
curaga
403e82c97b
Fix compiler warning
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13238 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:15:47 +00:00
hilnius
e95bafca44
adding even more log
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13237 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:56:19 +00:00
hilnius
12107053c0
adding log to better understand what is happening
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:51:02 +00:00
hilnius
cebbfdeb06
fix a bug that was making the game freeze (one protocol asked to start a protocol, and before the start of this protocol, was making infinite loop depending on the latter's existence)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13235 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:43:39 +00:00
hilnius
d3ac41f984
there was a problem in the server code : main loop never starting
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13234 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:31:18 +00:00
hilnius
b36e089ff9
can now start a game after a server requested it. synchronization does not work for now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13233 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:27:32 +00:00
hilnius
ab4a1995c0
online race startup sequence - adding players config in the state_manager
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13232 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 11:38:47 +00:00
hilnius
853d244882
was a problem with starting protocol in setup
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13231 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 11:15:15 +00:00
hilnius
4bde8a9337
adding a countdown feature to the synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13230 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 11:10:51 +00:00
unitraxx
ecaa073eb5
Made the few buttons there are in lobby, do something.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 01:32:09 +00:00
unitraxx
c2c314a2c2
Fixed issue that requesting to join a server signed you out.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 01:20:06 +00:00
unitraxx
395b000bee
Removed the addons_screen references to the tab_stop method which were left behind
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 00:37:05 +00:00
unitraxx
ebc1af345d
Remove the tab hack completely
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13225 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 00:32:19 +00:00
unitraxx
67854a7efd
You need to sign in now, for the features where it's needed. Also made a temporary implementation for quick play.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13224 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 00:25:56 +00:00
hilnius
db376f9745
a bit more log
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13223 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 22:54:45 +00:00
hilnius
6fdf7cb55e
some things forgot in last commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13222 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 22:37:22 +00:00
unitraxx
567f6302ed
Removed the old tab hack from scalable font. (Could someone check if done correctly?) and made it possible for table entries to have both left-aligned and centered content.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13221 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 22:24:06 +00:00
hikerstk
36653fada6
Updated VS project file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13220 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 22:09: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
unitraxx
a0b20697d2
Removed space for icon, if there is none.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13218 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:52:51 +00:00
unitraxx
bc236c0f99
adjusted addons_screen and server_selection to use the new capabilities of the list widget
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13217 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:47:48 +00:00
unitraxx
de6cc44b2a
List widget now supports multiple columns, each cell can have an icon and or text.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13216 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:33:33 +00:00
hilnius
c50a24a25d
adding a protocol to start a game, added features in the synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13215 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:19:22 +00:00
unitraxx
2d0d407d7f
Small bugfixes in the CGUIListBox
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13214 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 01:01:56 +00:00
unitraxx
b44f547057
Copied the CGUIListBox widget to make an STK version.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13213 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 00:34:47 +00:00
hilnius
75df500884
synchronization protocol works. the command 'synchronize' in the command line after being connected (both on client and serv) will start the protocol on both and calculate the average ping
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13212 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 00:00:20 +00:00
hilnius
8a2f6a9888
debug info in synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13211 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 23:35:34 +00:00
hilnius
e002d4f1bd
correcting the synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13210 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 23:31:56 +00:00
hilnius
2f08ee8902
had forgot to add new files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13209 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 23:16:40 +00:00
hilnius
c1534075d3
adding a protocol to synchronize client/servers and a little bit of code to test it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13208 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 23:12:53 +00:00
unitraxx
ec34fcafa7
Stay signed in works now (with checkbox in sign in dialog.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13204 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 22:25:17 +00:00
unitraxx
3463a01e85
Remember session (without GUI) and starting to integrate online-multiplayer and addons networking code. (Limited to config file for now.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13202 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 15:59:27 +00:00
unitraxx
200127102d
Big commit related to server joining.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13196 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-12 23:12:31 +00:00
hilnius
ebc4c60e2c
reducing thread consumption. One thread is still updated as often as possible, but i don't know which.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13195 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-12 15:03:32 +00:00
hilnius
12075a19b7
fixing some memory leaks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13194 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-12 14:08:33 +00:00
unitraxx
8dd9314eaf
server fetching and selection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13193 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-12 01:07:26 +00:00
auria
00b1c6c497
Update physicsonly setting in hacienda
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13190 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 23:25:03 +00:00
hikerstk
706c231691
Avoid crash in case of ENENT_..._NONE messages (which typically
...
don't have packet data).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13189 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 22:41:56 +00:00
hilnius
d0059d32d4
had forgot one line
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13188 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 22:09:33 +00:00
hilnius
09bccbe3e2
may fix things on hiker's windows :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13187 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 22:07:38 +00:00
hilnius
d08239064b
had forgot a line
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13186 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 15:56:10 +00:00
hilnius
d5ab7a666d
connection/disconnection of peers is now handled by both server and clients, when players select karts, other player are notified. the storage of players on a server is fine.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13185 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 15:35:31 +00:00
hilnius
44d18fff28
adding the formerly connected peer in welcome messages for newly connected peers so that they know who is already in the game
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13184 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 14:05:18 +00:00
hilnius
f03e366809
adding debug logging to see why when two players are connected, only one gets all the kart update messages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13183 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 13:39:36 +00:00
hilnius
4334472a3a
event more pointers, now everything works
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13182 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 13:30:16 +00:00
hilnius
64c1ee950f
more pointers for less bugs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13181 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 12:59:53 +00:00
hilnius
ea8cb2f5c4
fixing other pointer multi-thread problems
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13180 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 12:22:35 +00:00
hilnius
66de06e0e5
improving management of peers to avoid fails due to multi-threading
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13179 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 12:03:28 +00:00
yasin-ghannam
a701cccc02
Team Identifiers(Needs adding hatOffsets to kart models)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13178 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 01:17:39 +00:00
hilnius
8e8d7110fe
final fix that should fix all thread-pointer-peer-segfault-double free bugs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13177 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 01:14:12 +00:00
yasin-ghannam
085080e95e
Team Identifiers(Needs adding hatOffsets to kart models)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13176 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 00:57:13 +00:00
hilnius
dfc55a2f0b
silly error causing double delete correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13175 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 00:38:33 +00:00
hilnius
f15a9b58c4
should resolve segfaults
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13174 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 00:25:39 +00:00
hilnius
7665f30828
sync work
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13173 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 00:03:47 +00:00
auria
e546794ad9
Fix GCC build
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13172 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 23:36:50 +00:00
hilnius
b00bb5c050
fixing segfault and comparison operators
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13171 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 23:03:45 +00:00
hikerstk
3470a05251
Fixed rescue positions (two of which were incorrectly set in blender,
...
and the other suffered from an exporter bug).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13168 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 22:50:57 +00:00
yasin-ghannam
d16a5a0552
Team indicators added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13167 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 22:49:51 +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
hikerstk
b20cebfee0
Refactored handling of rescue: this removed a lot of
...
duplicated code, and also allows non-race mode rescue
positions to be tested in track-debug mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13165 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 22:47:12 +00:00
hilnius
3c3868210f
improving again the protocol system, fixing some pointer issues that might appear
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13164 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 22:46:23 +00:00
samuncle
5e70f409af
Add indicator for team (soccer mode)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13163 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 20:50:15 +00:00
hilnius
212b77fef3
adding features in the client lobby room protocol, separating client and server lobby room protocols in their own files to have clearer code
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13162 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 20:15:17 +00:00
hilnius
8ca4b62038
bored of writing commit messages >.<
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13161 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 13:44:30 +00:00
auria
69f414dc87
remove another unused file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13160 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 00:11:44 +00:00
auria
159191eca9
remove unused file that's no longer exported by the exporter
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13159 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 00:09:24 +00:00
hilnius
6199524440
fixing buts appearing after some time being connected
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13158 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 23:46:09 +00:00
hilnius
72ed28a992
repairing some bugs appearing after a certain time being connected
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13157 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 23:35:53 +00:00
hilnius
bcc4fafa94
adding back sources.cmake
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13156 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 22:05:52 +00:00
hilnius
4446f530db
adding command line features for a client to connect to a server
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13155 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 22:05:06 +00:00
hilnius
54aaa39309
correcting a bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13154 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 19:13:35 +00:00
hilnius
ae2e656059
updating hilnius branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13151 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 17:37:45 +00:00
hilnius
7cf9cfa8d9
branch was too much full of bugs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13148 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 14:21:50 +00:00
hilnius
a55016301e
fixing segfault issues when trying to exit, the protocol update thread is now launched by the protocol manager (and not the network manager)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 14:07:28 +00:00
hilnius
4bd4386208
fixing a crash due to gui modal dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 13:14:48 +00:00
hilnius
008c2d57b2
fixing a crash due to gui modal dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 13:14:48 +00:00
hilnius
60e4a2bb5e
adding possibilities to connect directly with command-line options, adding console entry for the client server manager'
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13144 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 12:42:44 +00:00
hikerstk
157d688f96
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13143 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 06:59:07 +00:00
yasin-ghannam
c22941d354
Initial Score display. (Using only the first two karts)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13142 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 04:26:23 +00:00
unitraxx
bd3ee05f10
Small fix to comply with changed server-code. (Not tested - though is relatively small change.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13141 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 02:04:35 +00:00
hikerstk
49631c0027
Updated VS 9 project file, and fixed compilation problems.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13139 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 01:22:58 +00:00
hikerstk
7919f6e485
Removed unused code.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13136 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 00:05:47 +00:00
hilnius
587fcdec32
correcting little bugs in the lobby room protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13133 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 22:53:50 +00:00
hilnius
dc4a32c204
correcting some bug in message exchanging
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13132 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 22:47:24 +00:00
hilnius
b1f823ea71
hmmm that's so good ! working connection, better protocols, fixed ALL the endianness problems (sure this time :p)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13131 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 22:06:57 +00:00
hilnius
0ee94ed9ed
adding console entry for server, server stopping features (unregistering from database), now server_conn can use back the lock that was here
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13129 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 21:04:23 +00:00
hilnius
7476d2a3ca
after more little-big endian issues, people can now connect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13128 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 16:50:20 +00:00
hilnius
136b9d2b15
little-big endian issue failed before
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13127 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 16:02:08 +00:00
hilnius
39436d464c
little-big endian issue
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13126 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:57:46 +00:00
hilnius
ac6534615c
fixing a ENet connection issue
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13125 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:47:28 +00:00
hilnius
4a93c84adb
server-client connection should work now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13124 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:34:12 +00:00
samuncle
d374400d6a
Try to correct normals
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13123 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:07:47 +00:00
hilnius
293e53bbd1
supposedly working server-client connection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13122 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:03:36 +00:00
hilnius
ff28a8b7f0
finalizing weird commits
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13121 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 14:40:28 +00:00
hilnius
f56f1ec3b1
weird commit number 2 to fix issues
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 14:36:39 +00:00
hilnius
c3bf8a0358
weird commit number 2 to fix issues
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 14:36:39 +00:00
hilnius
fd0e627906
weird commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13119 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 14:06:23 +00:00
hilnius
1e94193b8b
splitting --no-graphics option into --no-graphics and --with-profile options
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13118 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:55:21 +00:00
auria
f198e93d0a
Bugfix: in some cases, like after tutorial, game would play at wrong difficulty
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13117 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:52:01 +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
66b96868ee
Fix some cases of input getting stuck during tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13115 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:07:59 +00:00
hilnius
9aa25a4e97
Modifications in protocols to use the http connector and xml to get information from the database. Correcting the --server option which wasn't working. Now launching supertuxkart --server will connect the user 'server':'serverpass' and start automatically a ServerLobbyRoomProtocol that listens to incoming peer connections.
...
Improvement of logging. Some were fatal whereas they shouldn't.
Improvement of the protocol system. There were mutex permanent locking.
Protocols that do not use http are now non-blocking (except maybe one).
A user can 'quick join' the server by logging then pressing the 'quick play' button in the online panel.
Improvement of packet serialization/unserialization
Added a ping protocol to ping peers as long as they don't respond
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13112 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 19:49:51 +00:00
unitraxx
2bf2ed0002
Start of creating servers
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13108 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 00:45:31 +00:00
hilnius
711ba681f1
protocol 'specification'
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13104 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 14:32:44 +00:00
unitraxx
3ef2c4772a
Merge my branch with networking branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13103 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 14:10:32 +00:00
hilnius
2f7bcd60bb
starting a merge
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13102 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 13:03:14 +00:00
hilnius
e0e64680a5
merging trunk and networking. 'data/gui/menu_story_focus.png' has its networking version kept (dunno why the two files were different, they seemed same to me)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13101 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 11:48:23 +00:00
unitraxx
4208a28f7d
Merge and lobby GUI tweaks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13100 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 01:28:31 +00:00
auria
68c2ee3479
Remove useless center from box image so that GUI skin is freer to stretch it as needed
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13099 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 01:20:36 +00:00
auria
900d495ee9
Make GUI lists just use box, to make them in line with the latest changes that borders should be inside width/height
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 01:05:08 +00:00
unitraxx
bf13bed7a2
Merge with trunk
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13097 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 00:38:39 +00:00
unitraxx
83b270cccd
Lobby settings screen. Quick draft that will be used to test the server functionality. (Looks ugly now, need to merge with trunk again.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13096 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 23:26:44 +00:00
unitraxx
8617e0e15c
Key navigation now works perfect. (Had to be changed due to the fix Auria provided for the GUI Engine)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13095 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 23:23:28 +00:00
auria
88c1a3b56c
Prevent double ribbon events when using mouse on a ribbon that's in a dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13094 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 22:55:12 +00:00
auria
2719079977
Improve upon previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13093 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 22:41:25 +00:00
auria
d5168a6f4f
Fix textbox glitch : you could still type in the box after it lost its focus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13092 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 22:37:52 +00:00
samuncle
e25dd45d48
Add more details
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13090 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 22:28:07 +00:00
hilnius
78b9a7d6a7
adding a new string class to easily format packets. added features in the lobby protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13089 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 16:16:02 +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
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
auria
af09c253a7
Return to overworld after tutorial if it was started from there
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13085 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 23:56:24 +00:00
hilnius
6b35cbb8fd
adding connection stuff in the lobby protocol, and a xls file in doc/ to describe the protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13084 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 22:49:45 +00:00
samuncle
2374a88c56
Add a texture for hotpants instead vertex color
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13082 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 22:37:20 +00:00
hilnius
01ceeaa23a
Adding the base class that will contain all information about all players, correcting events passing inside the protocols manager
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13081 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 20:36:50 +00:00
curaga
e3ebbbbb04
sfx mgr: Remove unused function declaration
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13079 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 19:31:19 +00:00
mbjornstk
b9499ce46a
Update build.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13078 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 18:57:23 +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
hilnius
253a3ec1e8
cleaning destructors, using log:: instead of printf or std::cout, cleaning more paths, removed useless fnctions
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13076 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 16:59:30 +00:00
hilnius
7a174fd122
cleaning the includes to meet stk's standard
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13075 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 13:19:32 +00:00
hikerstk
464daa8ac7
Updated VS project files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13074 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 02:49:34 +00:00
samuncle
bb64fec5d0
A new shader to make beautifull lightbeams
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13073 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 02:32:11 +00:00
auria
eecf0b67f6
merge minimal race GUI into normal race GUI. Slight changes but in the same spirit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13072 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 01:38:13 +00:00
auria
c39795b445
add close button on track info dialog, as requested on forum
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 01:10:49 +00:00
samuncle
a976338797
New shoes for Sara
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13069 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 00:38:34 +00:00
auria
ad6b60520c
Apply patch by xenux to improve the reload button
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13068 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 00:32:26 +00:00
samuncle
c213a9b3ae
New nolok logo thanks to Totoplus62
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13067 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 00:29:27 +00:00
auria
7e2548ff28
Fix misleading comment
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13066 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 23:22:06 +00:00
hikerstk
59c1fccef2
Created branch to synchronise work on soccer mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13065 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 23:02:14 +00:00
hilnius
91b85accf7
starting branch to merge network and lobby
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13064 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 22:58:13 +00:00
hilnius
1f42aaedb5
removing hilnius-testing branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13062 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 13:43:13 +00:00
auria
4c3ebfc99f
Forgot other skins in previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13061 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 02:01:23 +00:00
auria
ef148dd8cc
Rework how <box> tags work in STKGUI files for finer control over layout. Adapt existing layouts accordingly.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13060 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 02:00:08 +00:00
auria
056a62227f
Strings update
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13058 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 01:07:00 +00:00
unitraxx
b52c905f9e
Beginning of networking lobby.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13057 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 00:12:00 +00:00
samuncle
e3aac6f554
Bugs correction (missing textures)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13056 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-02 07:16:14 +00:00
auria
8bd89ae20e
Apply other part of patch by Lilian Gimenez to increase irrlicht number of axes. Some controlls have triggers and other stuff that gets reported as axes since they are analogic, and thus irlricht's limit of 6 is insufficient for these controllers
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 22:53:57 +00:00
auria
a27853a592
Apply patch by Lilian Gimenez to support gamepad triggers in input code
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13054 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 22:50:59 +00:00
hilnius
29697049ed
network rework
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13053 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 22:46:23 +00:00
hikerstk
ae0cfe90da
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13052 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 22:43:01 +00:00
unitraxx
49717d8cca
Fixed what should happen when pressing enter in the register and sign in dialog.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13051 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 01:06:11 +00:00
unitraxx
5ecf73d90f
Fixed sign out issue. I forgot that asserts only get checked with debug builds.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13050 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 23:41:30 +00:00
auria
ba320dc16d
Apply patch by xenux to improve addon filtering
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13049 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 23:38:21 +00:00
unitraxx
a6b492129e
[_GSoC Uni_] 'Screen' has now a callback 'onDialogClose' which gets called by 'ModalDialog' after being dismissed. (Also removed a debug line in RibbonWidget)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13048 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 22:16:29 +00:00
stephenjust
0f250999f8
Fix VS compilation problem from addon filters
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13046 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 19:01:15 +00:00
unitraxx
965a429bca
[_GSoC Uni_] Changed the online screen to use deactivated icons, now that's possible (again), instead of icons with a locked badge for actions that aren't allowed for unregistered users. Also changed initial focus of the screen, depending on the state of the user.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13042 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 16:35:53 +00:00
unitraxx
74cc3d1f01
Changed the border of the story icons to the softer one. Credtis to tavariz91.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13041 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 15:53:23 +00:00
unitraxx
340b22ef87
[_GSoC Uni_] Added Icons suggested by the designers on the forum.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13040 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 15:47:39 +00:00
unitraxx
d183cd3451
[_GSoC Uni_] Added extra flag to Widget, to allow hiding of widgets before they are added. Note that only RibbonWidget supports this at the moment and that other widgets should be adapted before making use of this feature (not so hard though). What it basically does is, not taking into account hidden widgets for lay-out calculation and navigation and not making an IGUIElement for the widget as it is not needed.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13039 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 15:14:26 +00:00
auria
4352ac3707
Update nitro icon in help to match new appearance
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13037 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 01:05:36 +00:00
unitraxx
6d37125348
[_GSoC Uni_] Merge to revision 13035
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13036 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 00:56:57 +00:00
auria
27642f332c
Apply patch by xenux to filter addons, thanks a lot\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13035 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 00:29:43 +00:00
auria
1a5a3be3cc
Apply tentative patch for ticket 964
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 00:13:28 +00:00
auria
fc9515222f
Tweak textboxes skin
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13033 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 23:46:51 +00:00
hilnius
613e97d0d6
breaking everything that was working. cannot even start a race now, need to rewrite the network manager and part of the race startup sequence
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 22:57:18 +00:00
unitraxx
4e2ef1347a
[_GSoC Uni_] Updated the interface code for the online part and some small adjustments to the underlying code. -- Ready for user testing! Can connect to the api server now. Activation not yet needed, mail addresses will not be saved, don't pick an important password. (Users will sometimes be deleted during development anyway.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13031 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 22:55:15 +00:00
unitraxx
0850ccf617
[_GSoC Uni_] Added a method to ribbon_widget to look for a child on id and get a widget returned.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13030 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 22:50:20 +00:00
funto66
e88c84d713
Fix orthographic error in French translation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13028 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 21:17:58 +00:00
unitraxx
dea6a6d721
[_GSoC Uni_] Extended ribbon_widget to only take in mind active children. Overall improvement of GUI and code organization.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 02:27:56 +00:00
auria
065b2645f9
Add physics-only flag example for Joerg to use
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13025 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 00:00:03 +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
hikerstk
c5686dad01
Minor bubblegum code cleanup.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 23:39:07 +00:00
samuncle
a57c9aaace
Add animations. I'm not an animator so if you want to improve them you are welcome
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13020 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 23:23:03 +00:00
samuncle
5d4a72bec3
Cleanup old unused files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13019 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 22:49:52 +00:00
samuncle
25a6aa8fec
Say hello to Sara our new character
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13018 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 22:33:45 +00:00
auria
055fd7bca7
Add new stars
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13017 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 22:24:37 +00:00
curaga
c368706798
No skidding backwards. Fixes 1013.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13014 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 17:49:55 +00:00
samuncle
8b9444430b
A better sound for the jump
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13011 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:55:23 +00:00
curaga
c700843910
Let items return their node
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13010 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:17:42 +00:00
curaga
7acada712e
tinygettext const fix
...
This moves ~8kb of writable data to RO, and improves optimization.
There is no need for the initial array to be writable anyhow.
The upstream project seems dead, so no point in submitting there.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13009 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:16:22 +00:00
curaga
9173c9b454
Make lod's getLevel public
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13008 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:15:28 +00:00
curaga
c47e937735
irr: Partial backport to expose pass setter
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13007 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:13:48 +00:00
curaga
98e9c8d43d
irr: skies respect Z so they can be drawn after
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13006 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:12:47 +00:00
curaga
448a7d02bd
irr: Add materialtype override
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13005 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:11:44 +00:00
curaga
9bfe9026ed
irr: Add drawall types patch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13004 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:10:42 +00:00
curaga
56177bdc93
irr: Add stencil patch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13003 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:09:21 +00:00
curaga
f2cca4e5e8
irr: Add first patch, changelog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13002 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:07:07 +00:00
unitraxx
f99f27cbf1
[_GSoC Uni_] Signing out. Online screen (beta) improvements.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13001 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 01:33:15 +00:00
red-skull
10668e8c68
Final part to fix #854 :
...
don't remove addons.xml and news.xml during re-init of NetworkHttp,
it's not needed anymore to force refreshing them when clicking "reload".
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12999 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 01:18:02 +00:00
samuncle
07f9e39680
Remove an old debug printf
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12998 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 00:08:41 +00:00
samuncle
89d7edf985
updated material.xml to remove old textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 00:07:11 +00:00
samuncle
7d02d29c03
New nitro items
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12996 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 00:05:30 +00:00
hikerstk
674be5b6d0
1) Fix #1011 by re-implementing the bubblegum not as a
...
damping of velocity, but as a max_speed restriction.
2) Bubblegum parameters are now fully configurable in
stk_config.xml.
3) Apply slowdown fraction also to speed increases
(e.g. previously a max speed of 23 with a zipper
giving a 15 additional speed with a slowdown of
0.3 would end up as: 23*0.3 + 15 = 21.9.
Now it is (23+15)*0.3 = 11.4. While this was done
mainly for bubble gums, it can affect other items
as well.
4) Used bubblegum as one word consistenly in variable
names and xml files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12995 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-27 22:25:36 +00:00
samuncle
8275d8a7a5
Add the sound effect for the jump. We need a better sound effect so its volume is = to 0
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12994 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-27 08:36:49 +00:00
unitraxx
075b3aa3c7
[GSoC Uni_] Enhanced online_screen. Let 'Sign In' and 'Register' connect to the server. Renaming GUI file. Added debug code to connector.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12991 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-27 01:38:16 +00:00
samuncle
b08fcc7801
Starting the refactoring for the new particle system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12990 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-27 00:58:59 +00:00
samuncle
13d84ce4f4
The xml file for the effect when the kart jumps
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12989 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-27 00:57:56 +00:00
samuncle
ee856d6a9b
Add and effect when the kart jump and land. To be improved
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12988 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-27 00:56:04 +00:00
unitraxx
83ff1cbe79
[GSoC Uni_] Made login and register dialogs navigable without mouse.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12987 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 17:29:52 +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
hikerstk
f147d8e662
Added some (experimental) leaning for karts driving fast in
...
a curve. Feedback welcome (note many karts have some leaning
in their animation, best use a kart like suzanne which doesn't
do that).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12984 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 11:00:53 +00:00
unitraxx
488b55f0e8
[GSoC Uni_] Registration has now 3 fases. Login also uses the new red error messages. This commit works for all testers as it doesn't connect to a server.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12983 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 01:41:28 +00:00
auria
524c0c6a59
Add shortcut to easily test swatters
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12982 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 01:23:26 +00:00
auria
50d62cc103
Minor clarification in challenge dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12981 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 01:23:05 +00:00
unitraxx
32c9aff78e
Edited label widget to allow color changing after the widget has been added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12980 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 00:19:23 +00:00
hilnius
36673a2112
doxygen commenting a lot of code, improved thread-safety, improved coding standards
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12979 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 00:05:17 +00:00
auria
b43c6eb4be
Remove gui_strings.h from source control
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 23:47:12 +00:00
auria
901bde8db3
Fix ticket #809
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12977 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 23:44:57 +00:00
unitraxx
f553d962d5
[GSoC Uni_] Moved online gaming related gui xml files to a separate folder. Changed the login dialog to have an input message and started with a registration dialog.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12976 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 15:16:03 +00:00
samuncle
ec15e46c88
particle effect for cake and bomb
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12975 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 10:53:29 +00:00
samuncle
55edd4d38b
Now each items that explode had it's own explosion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12974 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 10:52:37 +00:00
unitraxx
18828d5668
[GSoC Uni_] Sign-In Dialog fixed. Removed debug code in http_connector.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12973 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 00:08:03 +00:00
hikerstk
cceed70e09
Fixed another compiler warning - hope I didn't break anything.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12971 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 23:09:39 +00:00
auria
cee5451659
Fix typo in credits
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12970 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 19:34:58 +00:00
auria
15821eb31b
Add missing turkish character
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12969 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 19:25:06 +00:00
unitraxx
7e36035228
[GSoC Uni_] Several improvements. No point in having a decent commit message, if it's for me only ;)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12967 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 19:20:16 +00:00
auria
15cebefa34
Fix reloading addons, ticket #854
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12966 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 19:11:44 +00:00
samuncle
5a8f411128
Better nitro effect. Thanks to Auria for the new particle feature
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12965 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 19:04:50 +00:00
auria
8c07a80162
Convert explosion from hardcoded particle system to our current XML system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12964 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 18:40:30 +00:00
auria
fb6c949911
Add driveline for second way, closing ticket 847
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12962 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 17:42:58 +00:00
hikerstk
4b81118cdc
Updates VS project files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12960 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 06:13:44 +00:00
hikerstk
5595882cbd
Updated VS9 project file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12958 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 03:57:33 +00:00
hikerstk
47f27a4ea9
Fixed more compiler warnings (and added a const).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12957 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 03:56:50 +00:00
hikerstk
cfb60ba114
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12956 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 03:56:19 +00:00
samuncle
e6ac66447d
Small modification of the gauge
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12955 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 01:08:00 +00:00
auria
4039b9a7ef
Apply patch by xenux to replace the text rating with star icons. Thanks\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12954 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 00:34:38 +00:00
samuncle
6b01328169
New texture for mars alien. Thanks to fraang
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12953 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 23:28:35 +00:00
samuncle
31bab05953
Small bug corrected for the new nitro
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12951 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 23:15:07 +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
auria
ddec322a01
Improve error reporting
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12949 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 22:40:04 +00:00
samuncle
3adecbefee
.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12947 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 22:33:58 +00:00
samuncle
d4673f56bf
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12945 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 22:15:58 +00:00
samuncle
c6d0926d66
Add the correct icon for konqi
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12944 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 21:12:08 +00:00
samuncle
1cb000c4e3
The new texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12941 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:41:50 +00:00
samuncle
370a1506a4
The particle effect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12940 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:41:28 +00:00
samuncle
416a05ec39
Improved nitro. Now we have a nice smoke :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12939 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:40:46 +00:00
samuncle
e3c0f7cfb8
The new xml for nitro
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12938 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:12:10 +00:00
samuncle
73710606c7
Now main karts are updated
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12937 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:11:31 +00:00
samuncle
c3c51e4b3c
I forget the icon
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12936 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:09:59 +00:00
samuncle
befbce4973
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12935 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:09:37 +00:00
samuncle
de73fe345f
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12934 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:08:56 +00:00
samuncle
59ae3af074
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12933 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:51:32 +00:00
samuncle
1bb6b7c4be
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12932 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:46:41 +00:00
samuncle
889c2efef3
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12931 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:39:24 +00:00
samuncle
b06bb76b2d
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12930 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:35:32 +00:00
samuncle
67deb1b484
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12929 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:32:21 +00:00
samuncle
72219d232b
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12928 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:24:33 +00:00
samuncle
791a978c09
Update for new nitro system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12927 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:20:07 +00:00
samuncle
ac79047804
Nitro effect improved
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12926 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:19:23 +00:00
samuncle
f7d6f9e104
Change of the origin point for new particle system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12924 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 13:55:45 +00:00
samuncle
5e0f4b03ed
Change of the origin point for new particle system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12923 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 13:49:48 +00:00
samuncle
a6d3b2019b
Now skidding's particle are just under wheels
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12921 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 13:42:08 +00:00
samuncle
5a6737b6a8
Better particles for second skid
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12920 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 01:49:08 +00:00
samuncle
0ef7a2bcc2
A better effect for the second skid
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12919 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 01:39:36 +00:00
hilnius
f52469159b
the way events pass trough the protocol system is now clean.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12918 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 00:53:26 +00:00
samuncle
e950dab201
Correction of a small bug with stars arround the head
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12917 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-22 23:47:46 +00:00
hilnius
cd19ef2d78
cleaning the way events come out from Enet, improving peer management (removing double peers)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-22 23:45:46 +00:00
unitraxx
fe47e50341
[GSoC Uni_] Writing and fetching from database (registering) works. Lots of debug code to be cleaned up.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12913 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-22 02:47:28 +00:00
curaga
f54b10ccd5
Less load-time flicker
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12912 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-21 08:20:12 +00:00
curaga
454fef7fe4
Fix crash when closing window in the middle of a race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12911 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-21 08:19:17 +00:00
unitraxx
295a86017a
[GSoC Uni] XML parsing of the server reply. Username & Password back to std::string.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12910 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-21 02:12:38 +00:00
hilnius
bd1afde029
added thread-safety, starting to implement a clean way to transmit packets from lower to upper layers
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12909 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-21 00:26:19 +00:00
auria
564bc8ad23
higher-reo astroturf texture by totoplus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12907 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 23:02:36 +00:00
unitraxx
2e35f293df
[GsoC Uni_] Small commit to ask a question concerning stringw
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12906 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 22:49:46 +00:00
auria
e2c6ffb94c
Fix normal smoothing issues in mines
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12904 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 22:40:54 +00:00
unitraxx
ffb23fbc6d
[GSoC uni] temporarily removed connection with server.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 14:40:33 +00:00
hilnius
97394b5ac9
a client can connect trough a host behind a NAT (tested
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12902 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 13:04:32 +00:00
curaga
c28575a9d3
Disable unused aes, bzip2, and lzma.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12901 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 08:57:24 +00:00
unitraxx
a3ec5c3d97
[GSoC uni] Small increment.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12900 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 02:15:05 +00:00
auria
36fef2b0fe
new astro turf texture by totoplus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12899 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 00:49:50 +00:00
auria
2f18766b09
As was suggested some time ago, in nitro challenges, replace 'Go' with 'Collect nitro', since not everyone reads the dialog to know what they have to do before launching the challenge ;) and this causes much confusion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12898 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 00:40:03 +00:00
auria
1bbab17913
Fix assertion failure at end of challenges
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12897 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 00:31:31 +00:00
auria
df2430f26c
add missing file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12896 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 00:15:58 +00:00
auria
796f14b0d0
Simplify mines mesh near problematic spot in attempt to debug normal smoothing issue. Still not luck but closer to solution I hope...
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12894 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 23:48:21 +00:00
auria
824a0b3a25
Fix normal smoothing issues in hacienda
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12892 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 23:31:08 +00:00
auria
16dcb4f38b
Lock the highest difficulty until the game was beaten
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12891 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 23:21:22 +00:00
auria
2c336bb89e
Tweak GP-win message to be more accurate
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12890 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 22:27:50 +00:00
unitraxx
be11ce1cd0
[uni GSoC] Connection with server OK. Remark : won't work if you don't have a locally set up server, change the adress in the config accordingly and have the code of my stkaddons branch running.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12889 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 18:49:20 +00:00
hilnius
1b12026b19
Working mutliple-user connection trough enet, using STUN protocol. Needs to be tested on WAN to be sure it works.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12888 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 16:07:51 +00:00
hilnius
3d62fd1214
creating inherited singletons
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12887 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 14:01:25 +00:00
hilnius
6b1e1b94a5
adding the network singleton interface, cleaning the protocols code
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12886 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 11:45:32 +00:00
hikerstk
5e5356c005
Fix #989 : be able to use other devices than mouse for the
...
addons loading menu. THanks to xenux for the patch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12885 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 09:14:10 +00:00
unitraxx
98274f59d5
Base for having users and connection with server.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12884 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 01:12:45 +00:00
hilnius
714a85b507
Adding protocols to publish/hide information in the SQL database. The protocol that allows a client to identify himself, retreive a server public IP:port and connect to it is finished. Remains the server-protocol for it. Protocol management improved (protocols can be paused/unpaused).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12883 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 22:25:03 +00:00
hilnius
918af26024
cleaning http function
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12882 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 15:31:04 +00:00
curaga
2d50b47f56
Shader space cleanup
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12881 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 14:35:29 +00:00
curaga
a45bf5092f
Make skinning.vert valid 1.10 code so the checker can run to completion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12880 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 14:34:59 +00:00
hikerstk
088fd6edd5
Removed unused m_previous_finish_pos in KartStatus ( #980 ).
...
Atm the start position in a GP is determined by the overall GP rankings.
The variable m_previous_finish_pos was meant to be used when using
only the previous race position to determine the order. Since no one
complained about the way it is now, I just removed this variable.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12879 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 08:44:11 +00:00
hikerstk
2695639421
Cosmetic change only.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12878 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 08:39:45 +00:00
unitraxx
aa9eb45c8b
[uni GSoC] Removed ununnecessary file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12877 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 02:47:02 +00:00
unitraxx
609c908101
[uni GSoC] Some initial GUI code
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12876 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 02:44:00 +00:00
unitraxx
f863609de8
[uni GSoC] dialogs/login_dialog.cpp:39: undefined reference to 'vtable for LoginDialog'
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12875 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 01:53:26 +00:00
hilnius
f63ab88f88
removing unnecessary files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12874 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 00:42:54 +00:00
hilnius
57b7534a6d
basic protocol intrication, sending address info online, a client can set his public transport adress (ip:port) in a sql database
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12873 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 00:42:11 +00:00
hilnius
9e990e76e0
untrack files that shouldn't be tracked
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12871 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-17 20:53:14 +00:00
hilnius
1cac3c7815
improving socket management
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12870 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-17 18:06:02 +00:00
curaga
42cdf5ad59
irr: Disable some unnecessary config options (mesh writers, rare image writers, sw devices)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12868 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-17 14:30:05 +00:00
hilnius
27a7f1da6b
stun working
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12867 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-17 12:48:44 +00:00
hilnius
2469902478
stun update
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12866 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-17 12:46:42 +00:00
hilnius
d933eae338
base commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12865 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-16 23:54:02 +00:00
unitraxx
d21b8d890a
New branch for unitraxx's gsoc work.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12864 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-16 23:20:04 +00:00
samuncle
6e88272efa
Add fireflies
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-15 00:38:07 +00:00
samuncle
43d29dd828
Some improvements
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12861 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-14 23:13:31 +00:00
hikerstk
fc12f317e3
Fixed bubble gum skid marks which could be in the air.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-13 23:19:20 +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
unitraxx
5783294995
Lighthouse challenge adapted according to feedback.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12856 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-08 22:01:57 +00:00
funto66
8b3b3a80fe
Added constants for RVL-CNT-01-TR detection in MacOS Bluetooth format - support not implemented yet
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12855 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-08 20:59:34 +00:00
unitraxx
2336131f8d
Edited the challenge for lighthouse.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12854 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-08 20:45:47 +00:00
funto66
6db09a5642
Added RVL-CNT-01-TR support to Windows too (but no accelerometers support yet)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12853 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-07 21:33:11 +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
hikerstk
6b05b70d04
Ignore files and directories that don't need to go in SVN.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12851 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-06 22:16:35 +00:00
hikerstk
fef4d10c7b
Cosmetic change only.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12850 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-06 22:07:41 +00:00
funto66
5d184d863a
Updated to latest wiiuse fork + allowed the RVL-CNT-01-TR to connect and respond to buttons on Linux (but no accelerometer support yet)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12849 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-05 07:24:42 +00:00
hilnius
7eed6c59e8
Setting up the branch for hilnius.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@12848 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-04 00:19:23 +00:00
hikerstk
c532c9d175
Updated VS2010 project file, thanks to yasin.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12847 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-03 21:53:46 +00:00
auria
95c099137b
Remove accidentally introduced tabs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12844 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 23:53:10 +00:00
auria
d052ff36d1
Apply patch by xenux to correctly place focus when navigating addons screen with gamepad. Thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12843 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 23:51:12 +00:00
curaga
5b330aa0e4
On modern hw, you do want to always clear at the start of frame.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12842 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 10:34:32 +00:00
curaga
97b5069c39
Bind wireframe mode to the home key
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12841 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 10:24:41 +00:00
auria
2c39edea92
Add reset planes to green valley
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12839 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 01:34:49 +00:00
auria
2503f913a4
Extend greek font, fixes #829
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12838 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 19:52:29 +00:00
auria
fc2b2d0fda
Extend greek font, fixes #829
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12837 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 19:51:05 +00:00
curaga
304dceae8c
Add a common GLSL check.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12836 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 11:01:59 +00:00
hikerstk
5513ca08cb
Applied mpujari80's patch to fix vs12 compilation - thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12835 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 10:43:34 +00:00
curaga
769e093ae2
Fix linux build from 12832
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12834 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 10:31:27 +00:00
curaga
3e1843b129
Using namespace irr, so use it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12833 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 10:11:43 +00:00
hikerstk
9787cb84cc
Reverted r12826, since I prefer to have the core:: etc in place (to help
...
new developers in identifying where things are coming from). So instead
I removed the namespace statement, and fixed up all other references.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12832 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 10:04:48 +00:00
auria
4d1cc7a770
Add asserts to try catching bug #923
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12831 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 00:25:12 +00:00
auria
8745306354
Try to fix bug #972
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12830 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 23:48:51 +00:00
curaga
c80a679f37
Make sure exit() is available on newer gccs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12829 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 14:17:08 +00:00
curaga
ed9b4db88d
Remove a no-op test
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12828 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 14:15:50 +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
c06125b392
Clean irr_driver up - the namespaces are being used for a reason ;)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12826 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 14:08:30 +00:00
curaga
ef9a1e78eb
Only the GL driver is supported.
...
DX hasn't worked in months, SW are not worth their LOC, and NULL is pointless with
--no-graphics.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12825 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 14:07:43 +00:00
hikerstk
366f8cd6b1
Cosmetic changes only.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12824 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 06:26:47 +00:00
auria
a38a2e7c17
Resize a few leftover 1x1 images
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12823 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 00:07:59 +00:00
auria
72a5db6c26
Update track to latest materials XML format
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12820 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 23:40:51 +00:00
hikerstk
c42804dae5
Renamed parameter va_list, since va_list is reserved (which caused
...
compilation errors on VS).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12818 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 23:18:01 +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
c5bb98d1e4
Remove couple unused variables, mark some per-file vars static
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 19:28:48 +00:00
curaga
75e1c8bc69
Add an offline syntax checker for shaders
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 19:21:12 +00:00
curaga
be1c3de2fb
Define va_copy on windows. Untested, no windows here.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12814 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 15:18:50 +00:00
curaga
8c44958e5a
Re-try the logging fix
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12813 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 15:05:29 +00:00
curaga
5256d568e3
Fix a possible crash
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12812 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 13:27:02 +00:00
curaga
49cd57fbd9
Inline functions may complicate passing va_lists around, as they can be stack offsets.
...
See http://julipedia.meroh.net/2011/09/using-vacopy-to-safely-pass-ap.html
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 12:52:14 +00:00
curaga
b8cc3217d2
Fix an inefficiency in listing. Using std::string here allocates memory needlessly.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12810 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 12:37:59 +00:00
curaga
7986aa66de
Fix logging crash, using a va_list twice.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12809 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 12:35:41 +00:00
curaga
7d4c2bc33e
Remove executable bit from some images
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12808 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 11:54:58 +00:00
hikerstk
f53a9ed76c
Try to set mime-type to text/x-shellscript so that SVN
...
will recognise this file as non-binary.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 11:49:23 +00:00
curaga
007bbacf5f
Fix the --list options, broken by the file logging (we _want_ them to console)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12806 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 11:24:39 +00:00
curaga
320c525218
Ran the optimize script. 14mb off the data size, losslessly.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12805 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 11:21:39 +00:00
curaga
adf370519f
Add the script to losslessly optimize data
...
This should be run before making a release, and after adding new data.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12804 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 10:21:59 +00:00
curaga
1c48d76343
Some const & visibility fixes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12803 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 10:19:55 +00:00
auria
e99b3dcc94
Run update script on all tracks and re-export them to make sure all tracks have been upgraded to the 'new' format. In preparation for fully removing some old options from the blender panel and making it manageable again
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12802 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 02:09:51 +00:00
hikerstk
bc7d8df200
Fixed split-screen camera bug: when one kart's camera went into
...
'falling' mode, all cameras would go into falling mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12800 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 23:45:28 +00:00
hikerstk
717e0e2992
Fixed installation (the desktop entry still used --log=file
...
instead of --no-console), fixed help text for --no-console as well.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12799 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 23:44:28 +00:00
auria
ee9229f570
Apply patch by KroArtem to prevent being stuck with a bomb when playing with 2 players
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12798 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 23:29:37 +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
curaga
9f8996727d
Test commit, changing a comment
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12796 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 21:51:08 +00:00
auria
15509ca3db
Remove duplicate section in credits
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12795 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 00:40:13 +00:00
auria
ab2c534b36
Apply patch by KroArtem to correctly focus a widget inside the dialog, thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12794 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 00:16:35 +00:00
samuncle
b10897fa6b
Add checklines and lap counting
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12792 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-28 22:03:26 +00:00
hikerstk
6e00d4e141
Fixed compilation errors and warnings on linux.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12791 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-28 06:21:41 +00:00
auria
d0c2339915
Apply patch by KroArtem to prevent starting the tutorial from inside the tutorial, thanks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12790 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-27 23:23:40 +00:00
hikerstk
bb1b18f602
Fix #974 : space in screenshot file names. Thanks to curaga for the patch.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12789 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-26 13:32:26 +00:00
unitraxx
ad3bf48b0d
Small change to the checking of a saved GP. (First commit, don't shoot me if I did anything wrong.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12788 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-26 00:31:22 +00:00
auria
76532a81b5
disable fog on track selection screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12787 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-25 23:41:54 +00:00
auria
61a8fb802e
New lighthouse screenshot
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12786 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-25 23:29:51 +00:00
auria
b4b11fa3fc
Apply patch by belphegorr to fix nitro target
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12785 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-25 23:14:57 +00:00
mbjornstk
997ade4542
Update build system for GP saving.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12784 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-25 22:56:08 +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
b3e7a7ebbf
Applied Unitraxx's patch to save GP. At this stage no GUI support
...
was added.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12782 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-24 23:38:26 +00:00
hikerstk
7ac899ade7
Refactored wiimote handling, splitting into two separate files.
...
Also added non-threading support (while it is too slow/too high
latency it's useful for debugging).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12781 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-22 11:28:57 +00:00
hikerstk
e45f728008
Applied mpujari80's patch to fix vs12 compilation - thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12780 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-22 11:09:43 +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
auria
ff016a8c92
Fix issues with some drivers that don't like 1x1 textures by making the textures bigger
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12777 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-18 00:38:33 +00:00
funto66
6da6a225a5
Oops - forgot to commit the Irrlicht VS2012 project...
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12776 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-17 20:14:17 +00:00
hikerstk
3bbb6b30f3
Fixed performance bug: static objects were created as dynamic rigidbodies, causing
...
constant collisions.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 23:40:39 +00:00
hikerstk
f3e9520339
Renamed 'back to track selectin' to 'back to challenge selection',
...
which (imho) describes a bit better where this goes to. Removed
"Setup New race" when selecting a challenge from the overworld, since
it is confusing to come from the overworld and end up on the game
mode selection screen.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12774 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 06:53:01 +00:00
hikerstk
6d097b6ad5
Added --wiimote-debug command line option to print raw values read
...
from a wiimote.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12773 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 06:50:41 +00:00
hikerstk
879e0248aa
Moved handling of fire from controller into kart, so now all
...
events in the KartControl structure are handled by kart.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12772 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 01:08:55 +00:00
auria
f91448c4b3
Made the new lighthouse track the default, thanks samuncle\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12770 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 00:54:42 +00:00
auria
b7680d7177
Fix small fog bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12769 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 00:49:51 +00:00
samuncle
5f8979112a
Some bugs are corrected now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12768 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-16 00:35:31 +00:00
hikerstk
2a0e456dbf
Fixed wiimote handling on OSX.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12766 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-15 12:22:16 +00:00
samuncle
d8cdc72c10
I forgot to 'ghost' some ojects
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-15 00:16:06 +00:00
samuncle
53e3236fc3
Add more objects now we have 65 000 poly. Like tux tollway
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12763 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-15 00:09:46 +00:00
auria
e74821e053
Still a bit more materials cleanup
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-14 23:46:52 +00:00
auria
568c96648f
More material cleanup, move splatting where it belongs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-14 23:04:48 +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
funto66
5dfa231a23
Added Visual Studio 2012 project files - but I got it to compile only for the "debug" target! That should hopefully become obsolete if we switch to a full CMake-based build system.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12755 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-14 11:16:13 +00:00
auria
9625eb58e3
Move sphere mapping in the GFX dropdown along other effects, no need for it to be a checkbox, especially since it can't be combined with others anyway
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-13 23:53:22 +00:00
auria
4d6e45ce00
Rework a bit material panel. For some reason, the flag that tells STK to produce a water splash upon collision was placed in a dropdown among a bunch of shaders... Left old settings in place for backwards compatibility for now, some day we can remove them
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-13 23:21:57 +00:00
hikerstk
1003e49984
Fix #969 - honk sound played when last item is fired. Thanks to unitraxx.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12748 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-13 23:20:42 +00:00
samuncle
bb5aa6c7b2
Improved grass + new object
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-13 00:40:57 +00:00
samuncle
cb6918f62f
Improved grass and pine tree
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 22:09:16 +00:00
hikerstk
0149544763
Fix #966 : replace printf, thanks to muditjaju.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12742 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 22:04:26 +00:00
hikerstk
6517830538
Fixed crash caused by new grass shaders (SHADER_COUNT was incorrect),
...
changed array of pointer to a std::vector to track this kind of
problem earlier. Renamed Shader constants to have a common
prefix to make it easier to see that they are all related.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 12:15:45 +00:00
auria
0735e70f47
Remove Y changes from grass shader, that was intended
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 01:14:08 +00:00
auria
9a17110f33
Introduce a bit of random in grass
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 01:02:07 +00:00
auria
f1fe3e3428
Fix speed being computer per instance in grass shader
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 00:59:05 +00:00
samuncle
71740c527c
I forgot an object
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 00:37:29 +00:00
samuncle
c9fbfa0310
Add new grass with optimisation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 00:34:48 +00:00
auria
3b20637b48
Make grass speed and amplitude configurable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12735 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 00:14:53 +00:00
samuncle
fd54f68a92
Add Countless Blades of Waving Grass
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12734 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-12 00:01:43 +00:00
samuncle
9fd901fc4e
Add more object
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-11 23:21:57 +00:00
auria
3eb6c034d0
Add grass shader for samuncle
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-11 23:09:03 +00:00
samuncle
bb2c41b413
Add the new version of lighthouse
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12729 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-11 21:04:39 +00:00
hikerstk
da9d75bbae
Re-enabled windows console in debug mode - it's just handy to have ;)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12727 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-10 23:19:36 +00:00
auria
ad153aa14e
Make Nolok boss a little harder. To make it a real fight though the AI will need to stop falling into lava
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12725 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-05 19:59:59 +00:00
auria
ab2e864f1f
New bowling ball by Totoplus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12724 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-05 19:25:42 +00:00
hikerstk
47675eac1f
Fixed #951 - use Log:: , thanks to alasin.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12723 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-03 07:07:19 +00:00
hikerstk
7ab65aee16
Fixed #879 : avoid too many basket balls at the same time by introducing
...
a minimum amount of time (atm 15 seconds) before the next basket ball
can be found. Thanks to nixt for the patch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12722 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-03 06:48:47 +00:00
auria
81378440ba
Apply patch by Slagvi to make sure the last used kart is not locked
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12719 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-01 21:41:51 +00:00
hikerstk
e362700a22
Fixed double newline added on console output.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12718 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-01 00:49:21 +00:00
samuncle
c34959e6b4
More objects
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12717 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-01 00:12:03 +00:00
auria
0ace825d5f
Apply patch by Uni_ to fix error reporting when downloading an addon fails. Thanks\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12716 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-30 23:17:46 +00:00
hikerstk
09173c479a
Fix linux compilation error.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12715 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-30 22:18:01 +00:00
samuncle
b970b71e1c
path track finished
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-30 22:13:11 +00:00
hikerstk
e99e944f9b
Fix #942 . Thanks to hilnius.
...
(note I modified the original patch, and had no opportunity to verify it
again on linux. If it doesn't work, blame me, not hilnius).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12713 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-30 07:17:02 +00:00
samuncle
0a8f018664
Improved spaceship
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12712 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-29 21:48:53 +00:00
hikerstk
eaed4f1acd
Fixed #944 : Fixed coding style, added docs.
...
Thanks to quentin-bellay.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12711 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-29 06:50:23 +00:00
samuncle
110a4d04d7
Improved spaceship
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-28 22:55:03 +00:00
hikerstk
2a0909c2a9
Fixed #950 : "Add a build-time check that the irrlicht lib meets minimum requirements"
...
Thanks to curaga.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12709 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-28 22:20:42 +00:00
hikerstk
0d02f21e04
Fixed #949 : Using Log:: in addons_manager. Thanks to alasin.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12708 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-28 22:14:45 +00:00
samuncle
814282e20f
Add a basic spaceship
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12707 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-28 20:08:57 +00:00
samuncle
350aee13c2
Correct some stretched textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12705 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-28 11:18:48 +00:00
samuncle
7f777ca1c2
Add a new sun :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12704 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-28 00:40:04 +00:00
auria
088bc6d155
Update translation file, an addon I was testing accidentally creeped in :(
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12703 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-27 21:39:17 +00:00
auria
e7f3fb2068
New story mode icon by tavariz91
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-25 22:47:58 +00:00
auria
95e035579b
A few new items by totoplus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-25 22:36:39 +00:00
samuncle
5d22388610
Add the last lightmap. Now it's finished \o/
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-25 22:09:04 +00:00
samuncle
8eaae57440
Add lightmaps in natural section
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12696 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-24 23:06:03 +00:00
hikerstk
52a094ea10
Minor code style change.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-24 06:09:51 +00:00
samuncle
d362c5d1af
Add another lightmap
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-23 23:15:13 +00:00
samuncle
62c345e6a1
Add a blur arround the gauge when nitro is used
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12692 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-23 20:43:56 +00:00
hikerstk
a6223250db
Fixed #943 - replaced printf with Log - thanks to pkucoin.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-23 11:06:50 +00:00
hikerstk
b5c90675d9
Fixed #941 : highlight nitro bar when nitro is used.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-23 07:02:46 +00:00
hikerstk
5776ae8b80
Log all important info to stdout.log on windows (part
...
of #836 : remove console on windows).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-23 00:28:11 +00:00
auria
634c46906e
Apply patch by marius1309 to fix #939 , thanks\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-22 23:48:23 +00:00
hikerstk
3854da8189
Fixed crash in Easter mode when highest AI is selected ( #926 ).
...
Thanks to hired777.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12687 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-22 07:09:29 +00:00
samuncle
00a02b7d4c
Add more light mapping. 1/4 done \o/
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12685 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-21 23:31:53 +00:00
samuncle
757e34fdce
Add some lightmaps. Not all section are finished
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-21 22:41:34 +00:00
samuncle
a2e54c448d
Improved traffic light
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-21 18:29:28 +00:00
hikerstk
e43f86a860
Fixed wiiuse-debuig build.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-21 13:32:56 +00:00
hikerstk
c9695fa1d2
Disable console window on Windows ( #836 ). Thanks to hired777 for the patch.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12678 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-21 12:39:25 +00:00
auria
950bb62f5a
Apply patch to convert printfs to the log API
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-19 22:45:58 +00:00
auria
2da4e7b1f6
Apply patch to make sure CMake builds static binaries of libraries
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-19 22:39:43 +00:00
auria
1b96d33a50
Try to ignore accelerometers on linux systems
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-19 22:36:25 +00:00
hikerstk
9d5c41f4ad
Replaced many printf with log (see #937 ). Thanks to
...
unitraxx.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-19 06:53:17 +00:00
hikerstk
a693eb7eb5
Added reverse-sorting of addons ( #916 ). Thanks to ingridmorstrad for the patch.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-18 22:44:18 +00:00
hikerstk
418b024d6d
Updated codeblock support ( #919 ), thanks to viscrisn.
...
Note that I can not test if this works, since I don't have
codeblocks installed.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-18 07:09:10 +00:00
auria
f050eb418a
Apply patch by Uni_ to change prints into logging
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12671 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-18 00:45:46 +00:00
auria
1883136948
Apply patch by Yasin to fix remembering last position on overworld, thanks\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12670 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-18 00:11:35 +00:00
hikerstk
455f11cb0a
Fixed using switch in easter egg mode ( #924 ) - thanks to hired777.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12669 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-17 22:18:14 +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
23814a3145
Fixed 'fixmes': checking for locked tracks and karts did not work
...
anymore (since it's not known which player is actually selected to
use those). Since it can be assumed that whoever uses --track
or --kart will also use -N (otherwise the GUI will handle notification
of the player), this is now tested for player 0.
Also the corresponding --list-kart/track options will now use all
karts/tracks, but add '(locked)' at the end of locked items.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12667 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-17 07:18:23 +00:00
hikerstk
2829f711c6
Applied curaga's patch for #675 : don't create GUI with certain
...
command line options - thanks!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12666 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-17 07:00:30 +00:00
auria
816a7e9bbe
Apply patch by marius1309 to update printfs into log, thanks\! Accidentally got merged into some changes of mine to make the battle againt Nolok a little harder. Those changes are incomplete, but good to go for now, more tweaks may be done later
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-17 00:40:05 +00:00
hikerstk
9860f5f576
Moved call to RaceGUI::init out of world::reset to avoid
...
duplicated thunderbird: reset is called each time before
a race is (re)started, while an init function must only
be called once. This properly fixes #918 (referees not
removed), which was caused by init actually being called
twice. Also changed order of when the referee position
is computed: before it was computed before World::resetAllKarts
was executed (which settles the karts at their stable start
position). This resulted in slightly different start
positions (depending on positions set in blender, not
the position in which the kart were finally stable. This
fixed #917 .
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-16 11:37:25 +00:00
hikerstk
9773df37ee
Fixed crash (when some things are actually locked).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-15 23:01:44 +00:00
hikerstk
10317fe33c
Applied nixt's patch to use the new speedometer and
...
nitro bar.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12662 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-15 22:54:28 +00:00
hikerstk
f2aeedc41f
Fixed possible crash in debug mode, thanks to curaga.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12661 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-15 21:49:48 +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
385ba68ced
Fix traffic light synchronisation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12659 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-15 00:12:28 +00:00
samuncle
2e59513bb6
I forgot some files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12656 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-14 23:39:32 +00:00
samuncle
daec086bd4
Add more interaction in the track
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12654 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-14 23:35:16 +00:00
auria
e242c5a990
More icons by Totoplus62
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12653 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-14 23:20:36 +00:00
auria
c7d7dd93c5
Add higher-res Suzanne icon by Totoplus62, thanks\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-14 23:06:30 +00:00
auria
b731e8f7db
Apply patch by Nbhat to correct double referee onr ace restart. Thanks\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12651 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-14 02:00:14 +00:00
samuncle
60e2cbb20e
A new snow man for snow mountain
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12650 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-13 22:09:12 +00:00
samuncle
c2904a0b28
Some improvement
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12648 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-13 22:07:17 +00:00
samuncle
930d79b672
Change the fog color
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12647 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-13 20:25:30 +00:00
samuncle
1d4a571a76
Add halo arround lamps
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12646 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-13 20:00:20 +00:00
hikerstk
7565612c25
Make sure the #include files in leak_check are the same
...
in debug and release mode. This makes sure that missing
#include files don't show up only in release compilation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12645 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-13 14:31:20 +00:00
hikerstk
623513a22d
Fixed compilation errors and warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12644 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-13 14:29:44 +00:00
wardje
b7bc1f0ec8
Fix compiling in release
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12643 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-13 10:44:15 +00:00
auria
5bd8f58923
Tweaked skidding particles by Deve
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12642 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-12 21:24:21 +00:00
hikerstk
34fb38fd1a
Updated license for new icons.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-12 00:23:25 +00:00
hikerstk
7ee44eda18
Added new icons by Totoplus and Tavariz.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12640 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-12 00:12:30 +00:00
mbjornstk
e466badb2f
Remove duplicated declaration of videoData.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12639 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-11 22:45:02 +00:00
hikerstk
ccc8f788bd
Commited new art work for easter egg mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-11 06:27:51 +00:00
hikerstk
9a9ff77812
iAdded new 'best' AI difficulty. ATM this is not locked yet, and
...
art work (icon) is still missing. Also we have to find what
to call it (atm 'Iron Man').
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12637 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-11 06:17:46 +00:00
auria
58e06f6cd7
fix feature unlocked cutscene
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12636 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-10 23:41:13 +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
74b553d5d7
Convert farm emitters to new format, xyz=... instead of x=... y=... z=..., as part of ticket #912
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-10 22:56:55 +00:00
hikerstk
9871d556cd
Fixed linux compilation problem.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12631 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-10 12:51:01 +00:00
hikerstk
019e02bdb5
Fixed compiler warning (on OSX).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12630 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-10 07:09:10 +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
mbjornstk
9f01ffe2e3
Update build system.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-10 00:13:49 +00:00
magned
36b3f5d949
Removed line which caused errors for people without VS 2008
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-09 21:12:57 +00:00
hikerstk
f548a84071
Updated VS10 project files - x64 compilation is
...
now marked as 'experimental', and list of sources
updates.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-09 13:47:53 +00:00
hikerstk
b29b01107a
Fixed VS2010 warnings (too long names when expanding
...
templates).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-09 13:45:51 +00:00
auria
b48e5cb9b0
Delete old unused files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12624 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-08 00:31:28 +00:00
auria
8d820674b1
Fix more normals in tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-08 00:31:09 +00:00
auria
e30833ecf1
Fix normals in tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12621 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-08 00:27:56 +00:00
hikerstk
694b306f4f
Updated (c).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-07 22:47:37 +00:00
hikerstk
617bbc8f16
Fix #889 : Only play strike sfx when a bowling ball hits a kart (and not
...
when it hits another flyable).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-07 22:37:09 +00:00
hikerstk
9d46f847fc
Fixed #906 : screenshot filenames have an incorrect month.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12618 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-07 12:21:51 +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
d1759b8d88
Add missing conversion from radians to degrees when moving track object from physics
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12616 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-06 00:21:57 +00:00
auria
35b508ae14
Fix uninitialized pointer
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-06 00:17:35 +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
hikerstk
eb004a63a6
Updated source list, and fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12612 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-05 12:31:14 +00:00
hikerstk
7c509f5026
Updated VS project file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12611 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-05 09:19:43 +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
f296461d21
Fix physics angles
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12609 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-05 00:39: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
94cd32d20d
Do not stop music during tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 23:14:52 +00:00
auria
3cd4cc1cad
Fix reading freed memory after deleting world, plus add what it takes to detect further such issues easily
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 23:09:53 +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
mbjornstk
0e8eec0f88
Add new track files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 22:55:32 +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
f4b121feff
Fixed incorrect arrival time estimation ( #903 and #859 ).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 21:17:39 +00:00
mbjornstk
5d58993364
Removed deleted files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 21:09:46 +00:00
auria
7a3989dd94
Cutscenes need a GUI
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12599 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 01:52:02 +00:00
hikerstk
4a6f2beb50
Update for deleted files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 01:49:26 +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
cc6446cd1c
Removed unused files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12595 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 00:42:26 +00:00
hikerstk
8fe1875db1
Removed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 00:41:34 +00:00
hikerstk
9429beef79
Simplified more code, fixed some coding style.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-03 21:15:13 +00:00
hikerstk
aea7a001c5
Bugfix: when playing batle mode, the number of karts is set to the number of players
...
(independent on the number of AIs selected), and UserConfigParam::m_num_karts is not
changed (which is correct imho).
When then a single race is started, the displayed number of AIs is based on this
m_num_karts. But if a normal race is started (without adjusting the number of
AI karts), the number of karts in the race_manager was not updated (it is only
updated when changing the number of AIs), resulting in the wrong number of karts to
be used (based on the battle mode, and not based on the number shown in the GUI).
This patch just updates the race_manager with the number of AI karts that is shown
in the GUI, so that those values are now in synch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-03 11:12:25 +00:00
hikerstk
820ebd2673
Refactoring: removed code duplication in some init() and restartRace()
...
functions of game modes (caused by restartRace only called in case of
a restart, not the first time a race is started). The function restartRace()
was renamed to reset(), which is now called always before a race is started
or restarted.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-03 06:05:34 +00:00
auria
4cd55d0dc5
Fix bogus documentation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-02 23:55:38 +00:00
hikerstk
ecfdae57f8
Yet another fix for addons :( Now installation of addons might
...
work as well as deleting them.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12589 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-27 21:52:40 +00:00
hikerstk
9dfb6c4ccb
When pressing ctrl-F8 in artists debug mode only make player karts
...
invisible. This allows to take screenshots with AI (and if you don't
want AI, just race without AI).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-27 21:11:12 +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
81d6353d7b
Fixed typoes (see #897 ), thanks to bkerensa for the patch.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12580 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-26 05:22:25 +00:00
hikerstk
516e57d274
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12575 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-25 22:13:16 +00:00
hikerstk
f857393ca2
Removed time limit from easter eggs (if used in a challenge, the
...
challenge will define the time limit), which also fixes #861 (no
timer when easter egg mode is started first). Added high-scores for
easter egg mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-25 06:16:23 +00:00
hikerstk
b7e5480fb6
More work on improving documentation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12572 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-21 10:46:35 +00:00
auria
734b9707bc
Fix motion blur on some picky GPUs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12571 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-21 00:02:07 +00:00
hikerstk
4c33490a78
Improved doxygen documentation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12570 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-20 23:02:12 +00:00
auria
87f316fd03
Support combining splatting and lightmaps
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12567 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-18 01:08:35 +00:00
auria
98d8ef74ac
Simplify shader, removing the need to make a fallback mesh
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-18 00:21:28 +00:00
auria
7a81d37f69
Allow vertex colors to be used with lightmaps
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12564 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-17 23:06:37 +00:00
samuncle
82ce55b443
Water improvement
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-17 21:24:44 +00:00
samuncle
24d81c3b1a
A new topology for mines. To be continued
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12560 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-17 20:35:18 +00:00
samuncle
8434a6b633
Smooth the transition for clouds using vertex alpha
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12559 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-17 01:02:56 +00:00
auria
1cb4d02075
Some minor cleanup in cmake
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12556 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-15 23:02:05 +00:00
hikerstk
b54125fa38
Changed variable boost_amount to be boost_time, added comments,
...
and fixed incorrect blur direction.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-15 05:48:58 +00:00
hikerstk
de2112f101
Removed debug code (2nd player would also get zippers
...
in artist mode when pressing F7).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12554 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-15 05:35:03 +00:00
auria
cab6469443
Complete Cmake OSX 10.7 support. Hopefully Cmake is now ready to take over the manually maintained Xcode project
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 23:10:20 +00:00
hikerstk
5445cec7ba
Enabled motion blur shader in split screen multiplayer.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 21:04:48 +00:00
hikerstk
a14a9df3f1
Removed unnecessary "\n" in Log messages.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12551 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 05:26:17 +00:00
auria
8baa499323
Tweak CMake's ability to generate Xcode projects in addition to makefiles on OSX
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12550 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 02:06:09 +00:00
auria
a9056ee6bc
Adapt CMake to make it able to compile on OSX in 10.5 compatibility mode. The next step might be removing the Xcode project, less maintenance...
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12549 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 01:39:23 +00:00
auria
d4fa9e0cb6
Finalize integration of cmake build on osx with builtin irrlicht
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12548 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-13 04:03:26 +00:00
hikerstk
9299418079
Tweaked default wiimote settings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12547 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-13 04:00:19 +00:00
auria
af17db18c4
Integrate irrlicht into the STK build system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12546 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-13 01:31:09 +00:00
auria
1a7bf5ea9c
Update track list after installing addon so that it appears without restarting STK
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12545 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-11 01:26:07 +00:00
auria
051c3d43fe
allow transparent water. not used yet
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12544 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-10 01:27:45 +00:00
hikerstk
6c10c92838
Avoid that wiimote events are handled as digital events (which means
...
that the actual steering value will be changed over time, not immediately,
resulting in a delay). Fixed by avoiding +-32767 as input, which indicates
a digital event. Note that the same problem likely exists for gamepads!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12543 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-07 13:06:47 +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
auria
c5a9b4b6a5
Add tutorial icon to main menu by Totoplusm thanks a lot
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12540 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-05 23:37:31 +00:00
hikerstk
90bcf9f304
Made compliant with out coding style.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12539 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-03 20:47:08 +00:00
hikerstk
ef5352165d
Fixed compilation error (I swear, it worked on windows and linux for me).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12538 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-03 12:10:45 +00:00
hikerstk
e7f58450e1
Removed remaining hardcoded shader directories.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12537 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-01 05:42:38 +00:00
hikerstk
5e59de20fe
Fixed missing '/', and clean up varies paths (all directories
...
should end in '/').
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12536 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-01 05:33:36 +00:00
hikerstk
04bcf75a37
File manager now provides the directory for screenshots and
...
shader. Location of screenshots is now changed:
windows: %APPDATA%/supertuxkart/screenshots
osx: ~/Library/Application Support/SuperTuxKart/Screenshots
Linux: $HOME/.cache/supertuxkart/screenshots
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12535 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-01 03:11:17 +00:00
hikerstk
3485ae2d8c
Fixed screen shot handling on windows.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12534 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-28 11:51:19 +00:00
hikerstk
b0382b5532
More restructuing of rendering loop to make it a bit
...
easier to understand.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12533 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-28 11:50:05 +00:00
hikerstk
c062295a30
Made to implicitly constructed objects explicit.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12532 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-28 06:19:17 +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
auria
e5e335f505
move konqi back to standard group
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12529 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-28 00:24:26 +00:00
hikerstk
bf21f7e857
Try to reduce likelihood of karts 'driving' over a fence (by
...
collisions that pushes them with away with an upwards component
in the impulse vector).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12528 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-26 06:05:50 +00:00
hikerstk
c18ccef5b3
Added sin and asin in addition to linear and square mapping of
...
wii-rotation to steering value, all can be combined using weights.
Code is not tested (sorry, no access to wiimote atm).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12527 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-24 22:09:15 +00:00
mbjornstk
8df713d666
Update buildsystem with recent changes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12526 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-23 23:31:21 +00:00
auria
cbefe45764
Add new konqi
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12525 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-23 22:16:33 +00:00
auria
32c998e83d
Delete old Konqi, preparing room for new Konqi
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12524 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-23 22:15:12 +00:00
auria
b9504f4afa
Delete old unused files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12523 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-23 21:49:31 +00:00
auria
d115a581d8
Improved textures by Fraang
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12522 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-23 21:37:07 +00:00
hikerstk
b972326c5b
Fixed falling speed of kart (damping of linear velocity caused
...
the velocity to be too low). Since this would also affect kart
handling (negatively), the damping is only removed when the
kart is in the air.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12521 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-21 06:00:38 +00:00
hikerstk
ec2ca8a2f8
Re-enabled easter egg mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12520 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-21 05:57:35 +00:00
auria
cf597d7d6b
Add forgotten files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12519 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-20 04:13:31 +00:00
hikerstk
3e74063775
Added wiiuse-release target.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12517 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-18 22:01:43 +00:00
hikerstk
3cfa2dbf9c
Fixed crash (m_mesh counter was decreased for non-master object, resulting
...
in the master mesh disappearing).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12516 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-18 22:00: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
hikerstk
50e033f9f4
Fixed 'flying' problem in new mine track when driving into the water.
...
I have to confirm with bullet developers why this only happens sometimes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12513 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-18 06:19:39 +00:00
auria
d9af2f9706
Small improvement to challenge file, to add a textual player name next to the player ID, to make it easier to read
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12510 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-17 20:31:26 +00:00
auria
c51b746097
Validate AI power in challenge
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12509 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-17 20:25:26 +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
hikerstk
3046aaa361
Bugfix: STK would crash if the same kart mesh is used twice (e.g. when
...
just copying a kart folder). Thanks to funto for reporting this.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12499 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-17 11:26:52 +00:00
auria
903d1da403
Prevent shortcut in zen garden with additional checkline
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12497 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-17 00:40:42 +00:00
auria
f8f6262d53
mark tutorial as internal track
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12494 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-17 00:30:24 +00:00
auria
61bcdffb64
Show confir dialog before aborting GP
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12492 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-17 00:20:40 +00:00
auria
020fc76df3
Move tutorial to help menu
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12489 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-16 16:43:13 +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
stephenjust
42b3dfe98e
Update VC10 project
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12481 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-12 03:30:29 +00:00
hikerstk
fc9c94ff33
Updated VS9 project file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12480 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-11 23:56:50 +00:00
mbjornstk
d592aa4ef8
Add new files to build system after soccer branch merge.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-11 23:49:29 +00:00
samuncle
73ddfe8f34
A new section with natural rocks and a better displacement
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12477 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-11 23:22:34 +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
samuncle
9d099eab70
Add nice halo arround lamps.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12474 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-11 21:43:14 +00:00
funto66
293e928998
Cleanup soccer field unused data in christmas branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-10 18:56:41 +00:00
samuncle
ef91acd41a
Updated a small area of the old mine. To be continued
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12470 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-10 18:48:57 +00:00
funto66
cf0c4c920f
Cleanup christmas branch from all Christmas/Halloween things (replaced by hiker's hat code in trunk) to prepare for merging soccer mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-10 18:26:20 +00:00
auria
9a6264d01a
Revert accidental subdivision of the hacienda house
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12467 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-09 22:51:00 +00:00
funto66
43a37aee1b
Only enable Christmas mode in December, except --xmas=1 is given in the command line
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12465 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-09 15:01:58 +00:00
samuncle
a9220a3a5c
Remove the old wind mill texture. metal_beam is much better
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12462 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-08 18:02:53 +00:00
hikerstk
21063342a1
The 'feature' that objects below -100 are automatically reset
...
to their initial position (which was used to reset stones
falling down a volcano) must now be explicitely requested
(reset-when-below). This fixes the prpblem of floating
barrels in sandtrack.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12461 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-08 05:24:21 +00:00
hikerstk
9a4d6f1cda
Some adjustments to steering curve.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12460 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-07 21:49:38 +00:00
funto66
dd34c42bd1
Fix compilation with USE_WIIUSE
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12459 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-06 22:29:19 +00:00
funto66
2b08bde15e
Removed unused files from old version of wiiuse and updated corresponding CMakeLists.txt
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-06 21:40:11 +00:00
hikerstk
62a65279bb
Remove pause between news messages, instead a "+++" is
...
shown between messages.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12457 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-05 22:11:43 +00:00
hikerstk
97e8fddd7e
Added --wii command line option, which shows the connect-wiimote dialog
...
at startup.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12456 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-05 11:11:25 +00:00
mbjornstk
2588ba74a9
Remove deleted files from build system.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12455 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-04 01:35:10 +00:00
auria
57cc613c32
Update Xcode project
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12454 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-04 00:47:19 +00:00
auria
1478fb40aa
More subtle bomb icon by jymis
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12453 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-04 00:27:01 +00:00
stephenjust
3770c1e8cf
Update VC10 project (no wiiuse yet)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12452 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-04 00:18:04 +00:00
auria
0a3f9b6d93
Update for Wiiuse build on OSX, hope I broke nothing
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12451 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-04 00:15:45 +00:00
hikerstk
1e27f6356d
Updates VS 9 project file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12450 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-03 23:35:48 +00:00
auria
5446021d08
Fix build in previous build
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12449 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-03 23:00:59 +00:00
auria
a81fe6fbae
Delete old unused file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-03 22:31:24 +00:00
hikerstk
d12254237d
Made wiimote settings configurable in the user's config file:
...
wii-mote max is the 'angle' (0-128) at which full steering is
reached, and a weight factor to shape the steering depending on
wiimote angle, which adds up a weighted components of a linear
(weight=0) and quadratic curve (weight=1).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-03 21:50:24 +00:00
samuncle
b61a4450c9
I forgot a texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12446 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-03 01:12:11 +00:00
samuncle
602be0cc05
Add a bucket wheel excavator. I have plan to add some gems
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12445 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-03 00:27:15 +00:00
hikerstk
6dd7bdc4b6
Disabled easter egg mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12443 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-02 11:32:24 +00:00
stephenjust
c79b4f011d
Update VC10 project
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12442 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-01 05:15:18 +00:00
hikerstk
84fcb13914
Added wiiuse project file (read README for details on how
...
to use it).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12441 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-31 22:24:06 +00:00
hikerstk
6de0c776bd
Updated license information, with permission from the composer.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12440 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-30 23:29:44 +00:00
hikerstk
012f57cdc7
Added build environment for Windows VS 9.
...
Removed some compiler warnings about duplicated
#defines (isnan and RAD_TO_DEGREE etc). Fixed
some C++ errors (missing casts for void *), before
realising that wiiuse must be compiled in C mode anyway.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12439 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-30 21:11:43 +00:00
funto66
5ec7bd3a2d
Fix kart selection confirmation + fix ModelViewWidget::setRotateTo() that was not using the rotation speed
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-29 19:43:40 +00:00
funto66
c83678801e
Added an explanation message to the soccer setup screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12437 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-29 19:33:23 +00:00
funto66
03f063ce6d
Fix crash when coming for the second time to the soccer setup screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12436 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-29 19:22:54 +00:00
hikerstk
52cc6a5271
Removed more unnecessary '//' in paths.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12434 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-28 21:21:49 +00:00
funto66
e1bf43149e
Again some more work in the soccer team setup GUI
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12433 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-28 08:14:12 +00:00
funto66
271e32f30b
Some more work in the soccer team setup GUI
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-28 07:49:00 +00:00
mbjornstk
d7518e7800
Remove exec prop.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12431 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-28 01:46:13 +00:00
funto66
37372f49b3
Wiimote: use HOME for pause + hack to fix accelerometers reporting for some people (needs a better fix)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12430 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-27 09:07:23 +00:00
samuncle
edee6befad
I have add a tmp path (the oldest)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12429 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-27 00:52:03 +00:00
samuncle
972ddeea65
I have add a tmp path (the oldest)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12428 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-26 22:56:20 +00:00
samuncle
c47998dc29
Add the Milky way in the background
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12426 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-26 19:29:23 +00:00
funto66
6fa3ae7642
Some work on soccer setup screen + cleanup
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-26 12:54:31 +00:00
samuncle
30aa36540a
A more colorful nebula :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-26 10:39:57 +00:00
funto66
6174378be2
Fixed wiiuse's CMakeLists - sorry!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-26 08:43:48 +00:00
samuncle
ae6644f26f
Improved nebula and more stars
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12420 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-26 00:53:07 +00:00
samuncle
fdeb56dace
Add a nebula :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12419 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-25 23:11:56 +00:00
funto66
7935c687c7
Updated to wiiuse fork from https://github.com/rpavlik/wiiuse
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12415 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-24 22:53:34 +00:00
hikerstk
8e44df338c
Added include path for wiiuse.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12414 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-24 21:44:06 +00:00
hikerstk
b8179f122b
Removed double '//' in paths, and replaced printf with Log.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12413 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-24 21:12:06 +00:00
hikerstk
780a1e6dcb
Removed more "//" in paths.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12411 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-24 06:13:16 +00:00
samuncle
0e969cc3fc
Now we have the complete solar system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12410 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-23 23:45:43 +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
1254dbfa9e
Bugfix: if the highscore file is invalid, a double free happened.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12408 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-22 22:14:00 +00:00
hikerstk
08c3c7487a
More Log:: improvements.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-22 21:12:42 +00:00
samuncle
b9ef630f8e
Add jupiter, mars, saturn and neptun
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12406 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-22 20:26:45 +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
21eafebd92
Removed more unnecessary '//'.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12403 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-21 10:05:08 +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
samuncle
cb3a4afec2
I forgot some files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 21:53:38 +00:00
samuncle
ea7de12b63
Sun improvement
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12399 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 21:52:08 +00:00
samuncle
2f8a4b0555
Add solar flare
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12398 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 21:04:20 +00:00
auria
9d09e69b69
Add check to not crash when a kart has a null icon
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 20:28:47 +00:00
samuncle
f3e4a30c9c
Add earth, our home planet
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 19:43:57 +00:00
samuncle
cedb39edb4
A new star track version (still WIP, and with a demo of animation by step
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12395 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 12:29:12 +00:00
samuncle
aa3503c420
Now stk can use animated textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 12:22:25 +00:00
samuncle
12faa0167f
Now stk can use animated textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12393 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-20 12:22:07 +00:00
funto66
3ee8b0925e
Fix wiimotes cleanup crash when several wiimotes are connected
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-19 22:37:49 +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
funto66
6e20eac366
Added an instructions message when connecting wiimotes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-19 14:52:40 +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
0435f5106a
Add new acid lake texture by fraang
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12387 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-18 23:47:28 +00:00
hikerstk
c7274ac230
Made debug the lower priority, so that verbose output can
...
be used to display additional message for stk, but be
still able to filter out debug messages.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12386 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-18 03:50:31 +00:00
mbjornstk
c0a922fe7c
Add tutorial dialog files to build system.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-18 01:24:40 +00:00
auria
bd326d928e
New water texture by fraang
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12383 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-18 01:03:55 +00:00
hikerstk
f8774f6e52
Oops - committed an inconsistent version of this file, which doesn't compile.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12382 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 23:33:35 +00:00
auria
bf62dfa7de
Add warning when trying to open a dialog while the previous one is still visible
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12381 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 22:43:18 +00:00
auria
ec48b69f9d
Add missing file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12380 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 22:04:21 +00:00
funto66
7a223cc9b5
Use quadratic response curve for wiimote steering
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12379 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 22:03:06 +00:00
hikerstk
67dc8141da
Use Log:: in main.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12378 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 21:44:51 +00:00
funto66
7e9499d986
Added wiimote accelerometer handling - finally\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12377 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 20:06:06 +00:00
hikerstk
1b2ea5d572
Added Log:: calls, fixed layout somewhat.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12376 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 11:42:34 +00:00
hikerstk
8bfef9cb67
Fixed some incorrect Log:: messages, renamed the
...
component from 'translate' to 'translation' (to
be the same as the filename).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12375 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 10:27:33 +00:00
hikerstk
e3a7d67615
Updated VS9 project file (note tutorial_message_dialog.stkgui
...
is missing, so tutorial still doesn't work).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12374 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 10:16:39 +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
14c058a311
Work on tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 00:58:40 +00:00
auria
e8fa09ab11
Fix little texture issue in hacienda
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12371 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 00:51: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
funto66
823a0d266f
Handling wiimote buttons
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-16 22:37:21 +00:00
hikerstk
5da47c8202
Applied bug fix by Xeno for building on solaris.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12366 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-16 22:18:07 +00:00
hikerstk
e439cf6c48
Replaced more printfs with Log::.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12365 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-16 02:42:25 +00:00
hikerstk
12b10a80a6
Replaced more printfs with Log::.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12364 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-16 01:23:22 +00:00
funto66
e0725de73b
Refactored the wiimote manager - still WIP
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-15 22:29:29 +00:00
hikerstk
9c0e002f0a
Fixed 'No newline at end of file' warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12362 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-15 06:28:41 +00:00
auria
1e02f1f4cd
Update xcode project
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-15 00:40:52 +00:00
hikerstk
5ddbd2972b
Removed the leading '/' from all references to "data/...", so that
...
m_root_dir can be set to "" without causing the references to
m_root_dir+"/data" then to reference "/data" (instead of just "data").
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12360 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-15 00:16:35 +00:00
mbjornstk
c43dc15775
Update build system after log and tutorial changes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12359 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 22:42:40 +00:00
hikerstk
793b5d5d4a
Replaced printfs with calls to Log::.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12358 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 22:31:03 +00:00
hikerstk
76d2191ea9
Updated project file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12357 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 01:23:32 +00:00
auria
16df188b03
Delete old unsued files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12356 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 01:02:38 +00:00
auria
ff9f8503da
Forgotten file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 00:48:19 +00:00
auria
d8f4b60cf4
Minor modification to hacienda by samuncle
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12353 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 00:42:34 +00:00
hikerstk
c70b63ff40
Removed test code, and made apple use xterm colors.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12352 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 00:41:06 +00:00
hikerstk
5d8c0d7be1
Added log infrastructure. Only a few files of STK are actually using it,
...
but all (f)printfs should be replaced. Note that I had to rename
tinygettext/log.?pp to avoid linking problems on windows.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12351 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 00:38:07 +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
auria
fac5486e1b
New floor texture by RaceAce
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12349 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-10 22:48:55 +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
funto66
66ec50ce95
Added soccer ball icons for in-game GUI
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-09 21:47:57 +00:00
funto66
45790c0db4
WIP soccer mode GUI setup screen, don't draw player icons when in soccer mode, painted soccer cages in blue and red
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12346 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-09 21:32:43 +00:00
hikerstk
57a29ff15c
Added popup window to show a news message that has
...
'important="true"' specified. The message is only
shown once.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12345 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-09 05:46:26 +00:00
auria
24bb92f761
Add Hexley texture by s@f
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12344 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-08 22:43:17 +00:00
hikerstk
7472512175
Fixed compiler warnings (_C can be defined).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12343 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-07 21:29:50 +00:00
hikerstk
845465d60a
Fixed #858 : driving in overworld would reset number of
...
AI karts to 0.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12342 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-07 00:44:06 +00:00
hikerstk
7f98f7194d
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-06 12:12:47 +00:00
auria
47b5a604af
Improve ScalableFont to fix offsets introduced by recent font changes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12338 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-06 00:36:20 +00:00
auria
63aea86164
Blindly attempt to fix a bug I can't reproduce
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12337 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-06 00:01:16 +00:00
auria
e04a9b65a9
Fix some more double-faces issues in minigolf
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12336 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-05 21:06:51 +00:00
auria
fb03c77455
Apply improvement to UV texturing of tunnel entrance, submitted on IRC. While applying I discovered that all faces are duplicated, and started cleaning that (not finished yet)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12333 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-05 21:00:23 +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
auria
d5c2d07d8c
New skid/zipper particles by TotoPlus62
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-05 18:46:22 +00:00
dimstar
6d0362bba1
desktop file: bin/supertuxkart (default) won't work.. we need an
...
absolute path in the .desktop file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12330 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-04 15:52:53 +00:00
hikerstk
b163cd8406
Fixed documentation to be in synch with the values actually used.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12329 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-02 22:44:09 +00:00
auria
d635b86e84
Add forgotten file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-02 21:03:56 +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
9824370beb
Minor cleanup: remove useless ArenasScreen::setUsedForSoccer()
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12326 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-02 12:16:44 +00:00
hikerstk
20bb783219
Fixed rescue (which I broke in r12281 - sorry).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12325 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-02 11:37:29 +00:00
auria
164a910a05
Clean up GUI image file from /textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12324 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-01 20:22:43 +00:00
auria
7fbca3d2f0
Deprecate a couple more textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12321 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-01 19:47:53 +00:00
auria
27299e6cc6
Better detection of deprecated textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-01 19:46:53 +00:00
auria
baeaac3189
Display warning when a track uses a deprecated texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-01 19:01:39 +00:00
funto66
fa7c3cffb3
Soccer mode: WIP GUI state screen for choosing the teams and the number of goals to score in order to win
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-01 13:58:16 +00:00
funto66
be5f3e47e9
Fixed crash when playing soccer with a minimap (thanks WillemS for the bug report) + fixed tracks screen displaying soccer field when it shouldn't
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-29 17:44:56 +00:00
funto66
6b6cc75cde
Replaced soccer field screenshot with a better quality one
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-28 15:53:42 +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
4f54d52469
Added soccer_ball property for exported objects
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-27 16:20:39 +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
63e75648eb
Renamed SoccerBall.b3d to soccer_ball.b3d for consistency
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12308 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-24 18:44:34 +00:00
funto66
019b4cf4a0
Modifications to the soccer field: added real goals, removed obstacles, added checklines
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-24 18:41:54 +00:00
hikerstk
00418fce4b
Oops - forgot the models in previous commit.
...
Thanks to Funto for the hat!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12305 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-24 00:12:51 +00:00
hikerstk
9c8d78a57a
Added Christmas hats for 4 karts. There is no date dependency
...
(i.e. hats anytime) - but it shows this features.
Happy Christmas!!!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12304 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-24 00:10:41 +00:00
hikerstk
c6b5fe2147
Only cosmetic changes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12303 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-24 00:08:26 +00:00
funto66
01b88a9965
Added missing sky to soccer field
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12302 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-23 10:16: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
funto66
301ba4fb21
Added soccer icon XCF source
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12299 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-22 18:28:02 +00:00
funto66
7891ed8fd2
Added soccer field track (WIP)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12298 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-22 18:26:55 +00:00
funto66
5fedffcb75
Fix soccer mode crash
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12297 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-21 21:26:53 +00:00
funto66
a05e26bf05
Soccer mode - WIP
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-21 21:04:10 +00:00
funto66
d7290207bf
Added icon for soccer mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12295 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-20 21:56:34 +00:00
funto66
3c8634d3af
Soccer mode - WIP
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12294 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-20 12:49:38 +00:00
funto66
d814a8c676
Fixed compilation with USE_WIIUSE + tests with the nunchuk
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12293 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-20 10:50:58 +00:00
auria
af460b0e7d
Use new font for arabic
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-19 00:04:10 +00:00
auria
68ce3cc40f
Merge changes from branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12291 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-18 02:25:33 +00:00
hikerstk
9a0af72683
Bugfix: when pressing reload, news.xml was reloaded, but not assets.xml
...
(which is addons.xml). Improved debug output to print full URL of
files that are downloaded.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12287 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-17 23:24:33 +00:00
mbjornstk
93b3826179
Add egg hunt source files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12286 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-17 21:22:28 +00:00
hikerstk
d9c66a8bf6
Fixed compilation errors on linux and several warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12285 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-17 01:27:44 +00:00
hikerstk
6e03a431e0
Fixed mime-type to be text.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12283 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-17 00:44:03 +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
8202eb8f9e
change swatter icon at authir's request
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12278 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-15 14:23:04 +00:00
hikerstk
5c95ba0666
Applied fix from hasufell to fix #841 . Thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-13 20:23:26 +00:00
hikerstk
591d5d7f70
Use pkgconfig, as recommended by hasufell - thanks for the patch!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-13 02:23:14 +00:00
funto66
6edcfb1a00
Added Halloween mode, with the worst temporary icon ever - happens in October
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12271 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-12 01:03:44 +00:00
funto66
047d075a45
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12270 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-12 00:07:23 +00:00
funto66
eb91514076
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12268 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-11 22:38:02 +00:00
hikerstk
d0f50d64d7
Added 'updated sand track'.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-11 02:50:14 +00:00
auria
69bf7309cd
Add forgotten file
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12260 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-11 00:19:22 +00:00
auria
f1aea0dfb1
Update translations (trunk)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12259 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-11 00:15:44 +00:00
hikerstk
efcce418df
Raised one item to avoid warnings in stk.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 23:52:01 +00:00
hikerstk
872cb2d7f6
Removed unnecessary warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12255 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 23:31:34 +00:00
hikerstk
17d82e594c
Updated donations.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12252 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 23:17:47 +00:00
hikerstk
0154cec5a2
Raised three items to avoid STK warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12248 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 22:29:59 +00:00
hikerstk
8825cc59ae
Added moon texture.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12245 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 22:18:23 +00:00
hikerstk
6000027960
Re-export of minigolf, which adds new end cameras.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12243 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 22:11:35 +00:00
hikerstk
e2c2a0a9b0
Raised one item slightly higher to avoid STK warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12239 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 21:54:49 +00:00
hikerstk
12511139c2
Added sfx that went missing.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12237 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 21:44:34 +00:00
hikerstk
2655f0547f
Removed three items that could not be reached (and would produce a
...
warning in STK).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12234 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 21:34:41 +00:00
hikerstk
047405765e
Set mime type to text.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12232 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 20:42:41 +00:00
hikerstk
dab54738c1
Fixed memory leak.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 06:11:18 +00:00
hikerstk
bc4c86b898
Fixed memory leak in bullet.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12227 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 06:00:20 +00:00
hikerstk
e62cae9ad9
Install shortcuts for all users, not only active user (since the installer is
...
running as admin, installing STK as a non-admin user would otherwise not create
the shortcut for the non-admin users, but only for the admin user).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12225 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 03:06:29 +00:00
auria
1a269ac4ac
Add a couple leak-check macros
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12224 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 01:31:41 +00:00
auria
a083f97e6a
New icon for basketball
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12223 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-10 00:50:27 +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
2ce395ba0d
Don't hardcode player ID
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12220 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-09 22:14:27 +00:00
hikerstk
02b730b3e5
Fixed engine sfx in overworld.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12217 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-09 12:36:37 +00:00
auria
cf4dd96871
Fix memory overflow
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12215 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-08 22:35:27 +00:00
auria
bebf7f85c9
Fix non-pot textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12214 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-08 21:09:52 +00:00
auria
533c723ac9
Fix non-pot textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12212 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-08 21:07:37 +00:00
auria
294eecadbf
Fix non-pot textures
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12210 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-08 20:57:43 +00:00
auria
a26a8983ea
Fix non-pot texture
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12208 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-08 20:47:54 +00:00
auria
2c6d55b9de
Updated demonhill song by ctdabomb
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12205 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-08 20:33:00 +00:00
auria
e0a0b74659
Replace rubber ball by basket ball (trunk only, not branch)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12203 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-08 19:39:31 +00:00
auria
4da81936a7
FIx paths
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12201 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-07 01:28:10 +00:00
auria
865a73c076
FIx paths
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12200 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-07 00:57:10 +00:00
auria
4838a1eb2f
Clear AI-override when appropriate, fixing #829
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12198 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-07 00:24:20 +00:00
auria
92fea12684
Make highlighting of devices in use more selective
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12194 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 23:56:56 +00:00
auria
857bf04a19
Small fixes in jungle
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12192 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 23:44:22 +00:00
hikerstk
05cec70d86
Fixed 'map fire to select' option by also work for gamepads, only
...
accept fire (and not any event like steering), and remove setting
the flag each frame.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12191 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 23:43:09 +00:00
auria
faa62f5977
Fix reverse flag
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12190 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 23:21:57 +00:00
auria
8e3b2ce6a0
Fix shortcut
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12188 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 23:21:04 +00:00
hikerstk
fe20c7d6a1
Accept 'fire' key in addition to 'select' to select a kart.
...
Auria, please review for potential inclusing in 0.8.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12187 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 10:58:04 +00:00
hikerstk
d77471b446
Refactored information exchange between modes and race GUIs:
...
instead of each mode maintaining an array of data for each kart
which is used by the race GUI, use one array in race_gui_base,
which is then filled by the game mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12186 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-05 04:04:01 +00:00
auria
b81f1333f9
Add slightly tweaked jungle track
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12181 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-05 00:10:43 +00:00
hikerstk
76c9cc0576
Bugfix, wrong name of b3d file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12178 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 03:28:44 +00:00
hikerstk
e0405ea8db
Removed 'use strict lapline' property, which caused the normal
...
lap counting methode to be disabled.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12177 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 03:26:57 +00:00
hikerstk
fe221d21b3
Removed debug output.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12175 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 02:38:26 +00:00
hikerstk
bba8be450a
Removed Asian characters (which are not displayed correctly, r12173 on
...
0.8 branch).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12174 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 02:32:31 +00:00
hikerstk
b97ecc5258
Added reverse flag back in.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12170 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 02:26:30 +00:00
hikerstk
2d6c0528dc
Added reverse flag back in.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12168 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 02:23:55 +00:00
hikerstk
c95de9eab7
Added reverse to snowtuxpeak.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12166 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 02:20:22 +00:00
hikerstk
aec8f0d800
Added reverse flag to star track.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12163 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 02:16:52 +00:00
hikerstk
7dd66dccfe
Re-export to enable reverse mode for lighthouse.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12160 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 01:57:25 +00:00
hikerstk
d78bd76876
Re-export to set reverse flag.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12157 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-04 01:46:43 +00:00
hikerstk
3b6a771034
Re-exported zen-garden to include missing Plane.002.b3d file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12155 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-03 23:42:15 +00:00
computerfreak97
122e716d74
Added command line option for network debugging: --debug=network.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@9272 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-15 04:50:46 +00:00
computerfreak97
8094fdf92d
Added debug info to networking branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@9249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-13 14:45:04 +00:00
computerfreak97
415644bbc4
Got enet working in networking branch. Thanks Auria for your help
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@9247 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-13 01:04:49 +00:00
hikerstk
75d51131a7
Removed accidentally committed 'backup' version.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@9246 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-12 04:45:11 +00:00
computerfreak97
987305239e
Actually update to the most recent enet :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@9244 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-12 04:27:12 +00:00
computerfreak97
e4251b2bc6
Update to most recent enet
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@9243 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-12 03:55:00 +00:00
hikerstk
07a98ef06b
Created networking branch for computerfreak.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@9242 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-12 03:07:31 +00:00