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

17090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benau
10937333a1 Remove duplicated code in navmesh 2016-08-03 12:37:48 +08:00
hiker
3eb94e023d Fixed error in rewind when only event but no state information 
was available at chosen rewind-to time.
 2016-08-02 21:24:10 +10:00
hiker
9f0529f26f Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-08-01 08:42:09 +10:00
hiker
a15c9529a5 Merge remote-tracking branch 'origin/master' into rewind 2016-08-01 08:18:38 +10:00
hiker
cdde62dadb Further tweaked restitution for track and bowling ball to avoid 
bowling balls jumping up and down, while still maintaining a push
back for soccer balls.
 2016-08-01 08:00:14 +10:00
auria.mg
ea939459e8 Improve string as suggested on transifex 2016-07-30 21:51:31 -04:00
Benau
6904402547 Fix wrong RTL text in arena screen 2016-07-31 09:04:10 +08:00
auria.mg
9a740311bf Merge branch 'master' of https://github.com/supertuxkart/stk-code 
# Conflicts:
#	src/challenges/challenge_data.cpp
 2016-07-30 20:53:37 -04:00
auria.mg
40ab343922 Fix string remaining in wrong language when changing language 2016-07-30 20:52:32 -04:00
Benau
788f168c7f Fix space before colon 2016-07-31 08:04:16 +08:00
auria.mg
b69faff13d Fix indentation (tabs/spaces) 2016-07-30 19:46:15 -04:00
auria.mg
347f977ea7 Fix english string, as reported a while ago but couldn't fix then due to string freeze 2016-07-30 19:44:21 -04:00
auria.mg
a318e3b216 Log out user when deactivating internet connection, fixes #2589 2016-07-30 19:43:48 -04:00
Elderme
a3c78a7245 Fixed polycount in kart selection screen 2016-07-30 11:31:23 +02:00
Benau
637e468f18 Use uniform copyright header for source 2016-07-29 11:50:37 +08:00
hiker
efe9fa6329 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-07-29 09:54:25 +10:00
hiker
8f7d47d3c3 Fix ball-track collision (which should also improve kart-track 
collision).
 2016-07-29 09:53:37 +10:00
qwertychouskie
611e70ac83 Show boost at startup (#2586) 
* Show boost at startup

* Fix https://github.com/supertuxkart/stk-code/pull/2586#issuecomment-235765919
 2016-07-28 19:24:42 -04:00
hiker
aba8d8d1f0 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-07-28 16:30:48 +10:00
hiker
83117fe649 Fixed wheel position in case of a rescue: if the suspension of 
a wheel is stretched at the time a rescue or explosion is triggered,
the wheel will appear to be very far away from the kart (not connected
anymore).
 2016-07-28 09:47:56 +10:00
qwertychouskie
277a4b9262 Fix #2542. Also update copyright year. (#2585) 
* Fix #2542.  Also update copyright year.

* Update header
 2016-07-27 18:31:39 -04:00
hiker
6ca0eed28f Added debug option to trigger a kart explosion in debug mode. 2016-07-27 17:34:59 +10:00
Benau
bc5e2f3e29 Add unit testing for fonts for translation 2016-07-27 11:48:38 +08:00
hiker
b1a7c01b6e Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-07-27 08:59:02 +10:00
hiker
6d0ad4a4fe Fixed compiler warning. 2016-07-27 08:26:41 +10:00
hiker
0db2a195b6 Fixed compiler warning. 2016-07-27 07:54:54 +10:00
Elderme
a21d7b4b71 Merge branch 'master' into renderer_refactoring 2016-07-26 22:16:48 +02:00
Elderme
7812965d37 Fixed issue with colorization (mistake when merging) 2016-07-26 22:04:57 +02:00
Elderme
cd1b9a66a0 Merged master in branch 2016-07-26 21:31:52 +02:00
hiker
f69d04edd3 Fixed STUN protocol (#fixed #2566). 2016-07-27 00:42:51 +10:00
Benau
cefead119a Try to use c++11 typeid for getFont 2016-07-26 08:04:12 +08:00
Deve
29185f679b Merge pull request #2581 from qwertychouskie/patch-7 
Update deps from INSTALL.md
 2016-07-25 11:51:31 +02:00
hiker
ba3497bb81 Properly set the camera type in the constructor (which previously 
was always 'CM_TYPE_NORMAL'). Fixes #2576.
 2016-07-25 17:45:24 +10:00
Benau
8c38e9e79b Merge remote-tracking branch 'origin/fix_timer' 2016-07-25 14:46:58 +08:00
hiker
c64733e3d0 Merge branch 'dijkstra-test' 2016-07-25 16:42:24 +10:00
Benau
5a7f3caefd Fix the rest non-working timer-related function 2016-07-25 13:48:41 +08:00
Benau
d9e0d0d458 Fix #2580 2016-07-25 10:18:11 +08:00
hiker
7e91642eb7 Merge branch 'master' into dijkstra-test 2016-07-25 08:37:48 +10:00
hiker
7196ddfba8 The unit test for battle graph detects incorrect parents for some 
(other) arenas. Those are false positives (often there is more
than one shortest path, all with the same length; e.g. in case of
a regular gridded section). Added more details in error reporting
to help in debugging, but generally disabled the test for identical
paths, only the actual path length is tested now.
 2016-07-25 08:11:56 +10:00
Benau
6a4fe397d4 Thanks devnexen for spotting this out 2016-07-24 15:56:02 +08:00
Deve
91b41272d9 Merge pull request #2579 from qwertychouskie/patch-6 
Update links
 2016-07-24 08:10:26 +02:00
Benau
236c9c44a8 Minor improvements for font 2016-07-24 09:56:46 +08:00
qwertychouskie
3d3b7a7de7 Update deps from INSTALL.md 
(and put them in alphabetical order.)
 2016-07-23 16:12:59 -07:00
qwertychouskie
42b80d5e9c Update link 2016-07-23 14:23:36 -07:00
qwertychouskie
94440645a0 Update link 2016-07-23 14:22:03 -07:00
qwertychouskie
178fbbfefa Merge pull request #1 from qwertychouskie/patch-7 
Update link
 2016-07-23 14:19:07 -07:00
qwertychouskie
493030ba9c Update link 2016-07-23 14:17:30 -07:00
qwertychouskie
9cbf8a0641 Update link 2016-07-23 14:16:09 -07:00
Benau
5b4d8e1f8a Remove old font settings 2016-07-23 10:48:48 +08:00
Rob Clark
ce38df268b couple small performance optimizations (#2578) 
* pass timeout to driver, rather than unconditional 1ms sleep

This way if the fence is signalled earlier, we can get on with life
sooner.

* optimize displacement bind/clear/render

Stop thrashing render targets, and group things together into single
render-passes.  And only bind/clear if we will actually draw.
 2016-07-22 20:29:42 -04:00