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 |
|
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
|
7f8fb7a5a7
|
Merging the client manually into the server
but i can't get the client to accept the console class of the server -.-" yet..
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-08-25 17:31:49 +02:00 |
|
|
Fujnky
|
4d8c4ffadb
|
Improved the replay control buttons in the demo player a lot.
* Now there is a combined play/pause button + a reset button
* Replaced the ugly strings with nice graphics
|
2010-08-13 03:17:13 +02:00 |
|
oy
|
822b002344
|
fixed the ninja tip cut off and made its weapon and pickup sprite equal. Closes #127
|
2010-06-23 20:09:15 +02:00 |
|
Magnus Auvinen
|
97eb28afae
|
reduced item respawn delay from 20 to 15 seconds again
|
2009-01-24 10:40:11 +00:00 |
|
|
Magnus Auvinen
|
c2c90982fd
|
increased the firedelay on the gun and hammer to 125ms. this is how fast a humanly doable. prevents usage of mouse wheel to get insane firing speeds
|
2009-01-11 13:54:42 +00:00 |
|
|
Magnus Auvinen
|
b70eb4263f
|
fixed unpure sprite
|
2009-01-11 13:42:01 +00:00 |
|
Alfred Eriksson
|
39a12060d6
|
removed the tuning filtering and warning. modded servers can use tuning for free. added pure server checking - ctf, dm and tdm gametypes are not allowed to have different tuning.
|
2009-01-11 10:40:14 +00:00 |
|
|
Alfred Eriksson
|
8dd58e48c3
|
fixed ninja effect
|
2008-11-16 11:13:21 +00:00 |
|
|
Alfred Eriksson
|
1e961fdece
|
fixed pickup sounds
|
2008-10-21 17:14:18 +00:00 |
|
Dominik Geyer
|
faa96f6d3a
|
show if servers use non-standard tuning and let serverbrowser filter for these; ticket #393
|
2008-10-05 09:57:46 +00:00 |
|
|
Dominik Geyer
|
397b9a764b
|
data-dir autodetection; data-dir override; compiled-in data-dir; messagebox if detection fails; does chdir into data-dir
|
2008-10-01 17:16:22 +00:00 |
|
|
Magnus Auvinen
|
d9d37b945e
|
some server restructure. added hook no attach sound
|
2008-09-23 18:08:19 +00:00 |
|
|
Magnus Auvinen
|
afeb3adc5d
|
small foot animation fix
|
2008-09-21 19:00:40 +00:00 |
|
|
Magnus Auvinen
|
53da3f0d40
|
added favorites. no saving of them yet however
|
2008-09-03 20:03:01 +00:00 |
|
|
Magnus Auvinen
|
f6c67c29cd
|
large commit with loads of clean up. more is comming
|
2008-06-12 10:51:48 +00:00 |
|
|
Magnus Auvinen
|
ac18c6a3bd
|
more stuff :)
|
2008-04-27 05:59:38 +00:00 |
|