GreYFoX
bee10fda8f
Merge branch 'master' of git://github.com/oy/teeworlds
...
Conflicts:
src/game/server/gamecontext.cpp
2011-06-02 19:13:40 +02:00
Choupom
603071ee92
fixed data struct names
2011-06-02 17:42:30 +02:00
GreYFoX
0df6d0541f
Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
...
Conflicts:
bam.lua
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/game/client/components/binds.cpp
src/game/client/components/chat.h
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/controls.cpp
src/game/client/components/emoticon.h
src/game/client/components/maplayers.cpp
src/game/client/components/menus.h
src/game/client/components/scoreboard.h
src/game/client/components/spectator.h
src/game/client/components/voting.h
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/client/render.h
src/game/collision.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/gamecore.cpp
src/game/gamecore.h
src/game/layers.cpp
src/game/layers.h
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/laser.h
src/game/server/entities/pickup.cpp
src/game/server/entities/pickup.h
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gameworld.cpp
src/game/server/gameworld.h
src/game/server/player.cpp
src/game/variables.h
2011-04-14 01:27:49 +02:00
oy
06115dd49d
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 20:37:12 +02:00
oy
1a5d70450f
added "reimplemented menu music by teetow-the-great-teetow" by Choupom
2011-04-13 20:00:54 +02:00
GreYFoX
aaac8a3f77
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/version.h
2011-04-09 22:33:06 +02:00
GreYFoX
f7f6058a92
Merged Oy, Cleaned up, removed some useless features and code parts
...
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
oy
05889f3e3e
fixed problem with the hammer hit particle
2011-04-09 00:02:08 +02:00
oy
9643fc36ae
added new hammer hit effect by SushiTee and Crises
2011-04-08 19:11:41 +02:00
oy
e63683e649
added new friends/mute icons and buttons by Crises
2011-04-08 18:45:57 +02:00
oy
b985fdc20a
added new friend/mute buttons by Crises and reworked the player options like Landil suggested. Closes #579
2011-04-06 20:18:31 +02:00
oy
867f944459
added graphic buttons for remove/add friend and chat ignore/notice
2011-03-28 21:10:37 +02:00
oy
18e5412358
added sound for highlighted chat message. Closes #508
2011-03-20 15:58:59 +01:00
oy
927954a53b
added new emoticons. Closes #362
2011-02-16 11:45:19 +01:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
GreYFoXGTi
1b2703aaba
Refactoring & fixed WEAPONSPEC_GUN in content.py
2011-02-12 21:18:41 +01:00
GreYFoXGTi
6889adc0bb
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
.gitignore
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
Sworddragon
4ff61fcdaa
Made compiling process Python 3 compatible
2011-01-06 12:27:50 +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
c24964ebcd
Added tele, speedup, front and switch layer to the client
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:36:08 +02:00
GreYFoXGTi
896634a061
Total Cleanup
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03: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
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
