Vincent Lejeune
8356941986
Add missing counters
2014-11-20 01:05:10 +01:00
Vincent Lejeune
3f17a5c93d
Add another marker
2014-11-19 18:10:47 +01:00
Flakebi
3e53787598
Smooth camera movement
2014-11-18 22:01:02 +01:00
Flakebi
497fa10695
First try of a fps camera
2014-11-18 11:55:32 +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
2d39a41b76
Fix "Unprotected use of alloca"
2014-11-17 00:10:26 +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
deve
322dec5419
Fixed mingw compilation in release mode.
2014-11-10 12:57:59 +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
Vincent Lejeune
6ea56bb974
Display bounding boxes
2014-10-31 01:46:35 +01:00
Tobias Markus
1acfc4a878
Add default constructor to class Tuple<>, fixes issue #1643
2014-10-27 23:12:07 +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
Vincent Lejeune
d0b996ab4a
Use template defined SetTexture argument sets instead of vector
2014-10-22 21:51:11 +02: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
Vincent Lejeune
95cf6c5f4a
Put 2d function in their own header
2014-10-18 18:16:50 +02:00
auriamg
3061123e3e
Merge pull request #1606 from Flakebi/fix
...
Fix some more bugs
2014-10-08 18:18:37 -04:00
deve
f8de826888
Fixed compiler warnings
2014-10-08 14:44:05 +02:00
hiker
bc7d8f6103
Fixed compiler warning.
2014-10-08 22:49:32 +11:00
Flakebi
069853b11f
Fix #1153 Cleanup logging code
2014-10-07 20:54:54 +02: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
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
e4e91bf25a
Only cosmetical changes to follow our coding style.
2014-10-03 08:18:31 +10:00
Vincent Lejeune
838e1b63da
Split cascade gpu timer
2014-09-30 21:39:56 +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
hiker
85ebcf1434
Fix VS 2013 compilation.
2014-09-23 20:50:50 +10:00
deve
d007703d6b
Fixed warning when SOCKET_ERROR is already defined.
2014-09-23 08:28:39 +02:00
hiker
ad20635cce
Applied patch for #600 (support 64 bit compilation on windows).
2014-09-23 14:41:32 +10:00
Flakebi
9c911a2891
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-09 12:07:34 +02:00
vlj
ef89e168f8
Improve fps translation code.
2014-09-08 20:15:11 +02:00
Flakebi
5858c05e74
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-05 22:46:17 +02:00
Marianne Gagnon
861a76ff55
Minor tweaks to profiler
2014-09-04 20:46:08 -04:00
Marianne Gagnon
0848087b1d
Fix profiler, do not sync twice per frame
2014-09-04 19:45:16 -04: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
Vincent Lejeune
b3b6b05765
Add profiler counter for rsm
2014-09-03 22:52:16 +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
Flakebi
a31ec772ff
Replace accidently placed tabs
2014-09-02 03:57:48 +02:00
Vincent Lejeune
a0b376f04d
Fix some warnings
2014-08-23 18:53:38 +02:00
vlj
5559a9fd1d
Add some #if !defined(APPLE) in debug screen
2014-08-20 02:02:34 +02:00
vlj
af4fdaf96b
Add "functionnal" include in debug.cpp
2014-08-20 01:56:04 +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
Marianne Gagnon
c425e7e153
Also export GPU markers to CSV
2014-08-14 19:41:33 -04:00
Marianne Gagnon
ba3027b6bb
Little improvement to for_in macro. Still only works on PtrVector though
2014-08-13 19:47:59 -04:00
vlj
9dd2021f8d
Factorize List* related code.
2014-08-12 19:18:01 +02:00
vlj
768d51d0c3
Add sliders to change ssao parameters.
2014-08-09 19:22:30 +02:00
