GreYFoXGTi
526e36f8a0
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/client/components/menus.h
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/variables.h
2010-09-27 06:32:14 +03:00
GreYFoXGTi
ac36e562a5
Made Personal Best/Vanilla Score Updated on game enter
2010-09-27 00:31:33 +03:00
SushiTee
5faec7c80d
changed pickup animation speed for demos according to demospeed (fixes issue 72)
2010-09-26 18:00:29 +02:00
oy
7e0b37e06c
fixed that it checks the current dir for demos too
2010-09-24 13:38:03 +02:00
Choupom
1cbf731fc0
improved demos listing
2010-09-24 13:22:40 +02:00
oy
27425facff
fixed last commit
2010-09-24 13:21:03 +02:00
Choupom
aa46c22e10
now put skins in an array to save memory
2010-09-24 13:13:46 +02:00
GreYFoXGTi
e56b75090c
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/player.cpp
2010-09-22 11:46:18 +03:00
oy
5156579d1d
fixed sound bug when using in the editor. Closes #136
2010-09-22 00:51:32 +02:00
GreYFoXGTi
67a5765c9f
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/components/camera.cpp
src/game/client/components/camera.h
src/game/editor/ed_editor.cpp
src/game/editor/ed_layer_tiles.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 21:27:40 +03:00
oy
cf2d46d3ba
increased deadzone when seeking through the file in the demo player
2010-09-19 16:36:10 +02:00
oy
a730704d10
fixed view offset when joining spectator. Closes #101
2010-09-19 16:12:18 +02:00
oy
80b570c795
fixed view offset when changing from spectator to player. Closes #152
2010-09-19 16:00:46 +02:00
oy
0905b7755d
localised the language names. Closes #153
2010-09-16 13:32:56 +02:00
oy
a2083b31e3
fixed last commit
2010-09-16 12:48:32 +02:00
Choupom
582763bc21
made folders in editor ( #80 )
2010-09-16 12:28:10 +02:00
GreYFoXGTi
3ffbd91fca
revert the score board
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-13 07:50:00 +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
a3337a68e7
fixed that player name and ping overlap in the scoreboard. Closes #106
2010-09-12 13:26:38 +02:00
oy
9ab3e7e121
fixed overlapping voting. Closes #100
2010-09-12 13:18:11 +02:00
oy
daab7fdcd4
fixed that score overlaps in the scoreboard. Closes #161
2010-09-12 13:06:55 +02:00
oy
fa9c8ee77f
don't show player specific debug info when the debug graphs are shown to prevent overlapping
2010-09-12 12:55:37 +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
e191b2c59e
when hooking a player don't use predicted values for rendering the hook. Closes #9
2010-09-08 02:54:03 +02:00
oy
e31b125a0d
use the numpad enter key as well. Closes #166
2010-09-08 02:32:41 +02:00
oy
d4b145a8ee
fixed Gui lock while deleting/reading demos. Closes #167
2010-09-08 02:27:48 +02:00
oy
cbf07ffa57
added fix for don't show cursor while playing demo by Choupom. Closes #128
2010-09-08 02:07:36 +02:00
Choupom
71109a98fb
fixed chat message with missing name ( #110 )
2010-09-08 00:20:59 +02:00
GreYFoXGTi
d1b3e01892
Merge branch 'master' of http://github.com/oy/teeworlds
2010-09-07 21:49:12 +02:00
oy
6299f6518a
disable emote selector and chat window in the demo player. Closes #126
2010-09-07 20:01:51 +02:00
oy
eecdff0cf5
fixed overlapping in last commit
2010-09-07 19:31:20 +02:00
ghost
56c4081da4
Demo name is now showed while playing a demo file
2010-09-07 19:12:11 +02:00
oy
ea25972e21
added rec notification by ghost91-. Closes #82
2010-09-07 19:03:59 +02:00
GreYFoXGTi
0c0c231f13
Merge branch 'master' of http://github.com/GreYFoXGTi/teeworlds into master3
...
Conflicts:
src/game/client/components/maplayers.cpp
src/game/variables.h
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:59:51 +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
ghost
5e1b3c74ef
Git does this one automatically, I guess it fixes lineendings.
2010-09-07 02:11:52 +02:00
oy
5ff7836638
fixed problems with the tilelayer dumping. Closes #86 . Closes #149
2010-09-07 02:06:11 +02:00
oy
0cfd1de760
fixed line endings
2010-09-05 19:06:27 +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
Choupom
fcfaa8389f
added Remove button in demos browser ( #66 )
2010-09-05 17:40:51 +02:00
oy
62fe7cd5b2
link selected item in the demo list to the first entry (if available) on startup and browse
2010-09-05 14:28:08 +02:00
Choupom
8f3e98208e
fixed demo browser ( #61 )
2010-09-05 14:13:42 +02:00
Choupom
25be8b1be3
fixed so clicking 3 times doesn't generate 2 double-clicks
2010-09-05 13:50:10 +02:00
GreYFoXGTi
f9f780ff28
Fixed lags and crashes on kp0 in-game. Closes #149
...
Closes #86
Added dbg_layers which is 0 by default to prevent Debug files output when when ingame and pressing kp0
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-05 05:29:27 +02:00
Fujnky
4123f28bba
Improved demo player another bit.
...
* Replaced the reset button by more common stop button
* Made the demo player automatically reset after demo ended
2010-09-04 16:23:20 +02:00
GreYFoXGTi
11f480a79b
Changed the Loading String to Loading DDRace Client
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 19:59:24 +02:00
btd
909c583d96
End merge
2010-08-26 00:30:21 +04:00