GreYFoXGTi
78ee6148f8
SortHash
...
Loading String
2011-02-16 12:22:55 +02:00
noother
901859a494
fixed all known bugs in racedemos & ghosts, including "ghost is shown when playing a demo", "ghost doesn't reset when crossing the startline
...
again" (this conflicts with racemod however, where the time isn't reset on crossing the start tiles again. This should be removed in
DDRace.), "ghost sometimes doesn't save" (this was because of kill tiles right next to finish tiles, and it just wasn't quick enough when
going through them fast), "demos contain a lot of garbage before the actual run (prior attempts)" ghosts and racedemos should now work 100%
2011-02-16 10:39:26 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
oy
c2ad73cfe8
fixed negative download speed. Closes #473
2011-02-10 12:38:20 +01:00
GreYFoXGTi
24a688b2c3
Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother
2011-02-04 22:15:02 +02:00
GreYFoXGTi
f1b002e7fa
DDRace flags for the server browser (client-sided).
...
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
2011-01-30 18:21:41 +02:00
GreYFoXGTi
2151883b43
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/gamecore.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/pickup.cpp
src/game/server/entities/projectile.cpp
src/game/server/entity.h
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/variables.h
2011-01-20 16:10:32 +02:00
oy
bf6fcc20f4
added an error popup on startup when the sound couldn't be initialised. Closes #425
2011-01-17 13:28:15 +01:00
GreYFoXGTi
2ec0e0eec4
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/console.cpp
src/game/client/components/hud.cpp
src/game/client/components/scoreboard.cpp
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
2011-01-12 11:08:17 +02:00
oy
b94c70d351
close the scoreboard when opening the menu in the demo player. Closes #407
2011-01-12 01:33:16 +01:00
GreYFoXGTi
1d9190fd5b
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/russian.txt
readme.txt
src/game/variables.h
2011-01-06 01:49:58 +02:00
oy
13902fef6c
show an error popup when demo deletion fails
2011-01-05 22:22:07 +01:00
oy
18461535fd
changed time left localisation in the map download popup to allow better translations
2011-01-05 17:28:53 +01:00
Damian Kaczmarek
073044747b
-Working ui_scale parameter.
...
(doing it properly would require lots of framework/interface job ...)
2011-01-05 12:14:36 +01:00
GreYFoXGTi
c5648311ed
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/german.txt
src/game/client/components/scoreboard.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/variables.h
2011-01-04 22:37:09 +02:00
oy
bcba9e5c89
moved HslToRgb stuff
2011-01-04 11:58:25 +01:00
GreYFoXGTi
3956c34b6d
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
2010-12-16 04:15:05 +02:00
oy
1d7df01e9a
added map download progress by kaddyd
2010-12-16 01:52:29 +01:00
GreYFoXGTi
2f5f332cbb
Merge branch 'master' into DDRace
...
Conflicts:
src/engine/client/client.cpp
src/engine/shared/config_variables.h
2010-12-13 03:43:22 +02:00
oy
c0530b0d09
added language popup on first start. Closes #336
2010-12-12 19:20:30 +01:00
GreYFoXGTi
45fa3d49b5
Revert "Client won't vote on comments by Sushi Tee" caused crashes
...
This reverts commit ed7a1d5bcd
.
2010-12-06 03:32:44 +02:00
GreYFoXGTi
ed7a1d5bcd
Client won't vote on comments by Sushi Tee
2010-12-06 00:28:35 +02:00
GreYFoXGTi
5d9ee1736e
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
oy
7a6006087c
removed duplicate note in password popup
2010-11-20 23:39:17 +01:00
Sworddragon
fc9211c777
Updated copyrights
2010-11-20 21:26:06 +01:00
GreYFoXGTi
a109e1150d
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/config_variables.h
src/game/client/components/console.cpp
src/game/client/gameclient.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
2010-11-18 01:10:59 +02:00
oy
d94355729d
added icons in the demo browser and the editor's file dialog. Closes #209
2010-11-17 19:46:50 +01:00
GreYFoXGTi
fb88a8e4e7
Added In-Game Server Browser. Closes #65 .
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-30 00:44:52 +02:00
GreYFoXGTi
4d204d642f
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/console.h
src/engine/shared/console.cpp
src/engine/shared/console.h
2010-10-26 00:25:36 +02:00
GreYFoXGTi
2f3152691c
Revert "ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b" because it's buggy and i never intended to pull it, but btd did
...
This reverts commit 5b5eb0b2c0
.
2010-10-25 20:09:08 +02:00
Choupom
d2519f7ab9
small ui fixes
2010-10-25 18:59:33 +02:00
heinrich5991
5b5eb0b2c0
ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b
2010-10-22 17:29:46 +02:00
GreYFoXGTi
4197a6ce8b
Re-enabled pure tuning check, reset tunings to vanilla values, made server apply DDRace tunings on startup and map change. Closes #97 .
...
Revert "Now can Join Vanilla servers. Closes #96."
This reverts commit c6fda43369
.
Conflicts:
src/game/client/components/menus_settings.cpp
2010-10-22 15:22:17 +02:00
GreYFoXGTi
c6fda43369
Now can Join Vanilla servers. Closes #96 .
2010-10-19 18:30:45 +02:00
GreYFoXGTi
ddf2883cb2
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/console.cpp
src/game/server/gamecontext.cpp
2010-10-16 21:59:59 +02:00
oy
639c32d661
do not show the restart warning in the settings if you change back to actual settings. Closes #90
2010-10-16 11:24:42 +02:00
GreYFoXGTi
d8e6cfcbdd
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/french.txt
src/engine/client/client.cpp
src/engine/server/server.cpp
src/game/server/gamecontext.cpp
2010-10-11 03:56:58 +02:00
oy
de7504282c
made edit boxes scrollable. Closes #96
2010-10-11 01:36:46 +02:00
Choupom
61201fea13
added reason to kick a player in the callvote tab
2010-10-11 00:31:21 +02:00
GreYFoXGTi
faaa8c241e
Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup
2010-10-07 15:33:48 +02:00
oy
3a98f7a048
added mod system. Closes #34
2010-10-06 23:07:35 +02:00
GreYFoXGTi
896634a061
Total Cleanup
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
GreYFoXGTi
fa379a806a
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/server/server.cpp
src/game/client/components/scoreboard.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
2010-09-13 07:49:01 +03:00
oy
c52ee7baa9
unbind a key with right mouse button in the controls menu. Closes #67
2010-09-12 17:15:09 +02:00
oy
5437513a0d
use escape key to abort binding a control key in the menu
2010-09-12 13:40:24 +02:00
oy
e226b47212
close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111
2010-09-12 12:43:03 +02:00
GreYFoXGTi
0b1b949a3c
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamemodes/ctf.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 05:37:08 +02:00
oy
e31b125a0d
use the numpad enter key as well. Closes #166
2010-09-08 02:32:41 +02:00
GreYFoXGTi
616498e7b1
Merge branch 'master' of http://github.com/oy/teeworlds into master
...
Conflicts:
src/engine/client/input.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/network_server.cpp
src/engine/storage.h
src/game/client/components/chat.cpp
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/collision.cpp
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:57:38 +02:00
oy
5588e1ec8c
fixed selected index when deleting a demo and added a popup to confirm the deletion
2010-09-05 17:53:31 +02:00