Commit Graph

10802 Commits

Author SHA1 Message Date
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