Choupom
deff0ce7c4
fixed netevent struct names
2011-06-02 17:40:08 +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
GreYFoX
63e059b8ff
Emoticons Enum has emoticons names instead of numbers
2011-04-13 20:31:16 +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
5b328e5484
added a limit for the number of votes that can be added to the server and send options as lists when a client joins. Closes #459
2011-03-26 22:06:29 +01:00
oy
359b806e95
added remove_vote command. Closes #47
2011-03-25 11:49:35 +01:00
oy
a4580d451f
added reasons to vote in general and show reason in vote hud. Closes #219
2011-03-25 10:26:59 +01:00
oy
8ad3def65e
added aliases for votes. Closes #144
2011-03-25 09:49:21 +01:00
oy
30d9c9f4d9
made network support clan name and country code for players
2011-03-15 11:23:49 +01:00
oy
1f10c1e8bf
fixed problem with ctf if there're no flags
2011-03-10 10:14:41 +01:00
oy
ee2f625754
added extended spectator mode. Closes #28
2011-03-10 10:08:14 +01:00
oy
9811c2396b
made network clip flags. Closes #131
2011-03-04 17:08:10 +01:00
oy
4bede550be
only update the ping if the scoreboard is active. Closes #27
2011-03-01 18:31:20 +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
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
a72848e780
added constants for teams by Choupom
2011-01-03 12:50:38 +01:00
btd
62ef58329d
Return DDRace stuff. No need in mistic compatibility
2010-10-31 23:50:40 +03:00
GreYFoXGTi
85df8a047d
Fixed btd's last commit and ensured RaceClient Support(tested)
2010-10-30 21:44:46 +02:00
GreYFoXGTi
8d88f5d541
Partially Revert "Refactoring" to keep DDRace compatible with SushiTee's Stuff
...
This partially reverts commit 505a5b4172
.
2010-10-30 20:17:59 +02:00
GreYFoXGTi
505a5b4172
Refactoring
2010-10-29 23:29:07 +02:00
btd
a62decbc91
Show others for ddrace clients.
...
Need to fix entities now.
Signed-off-by: btd <bardadymchik@gmail.com>
2010-10-24 14:47:25 +04:00
btd
61092f7baa
Begin show_others
...
Signed-off-by: btd <bardadymchik@gmail.com>
2010-10-23 23:26:10 +04:00
GreYFoXGTi
896634a061
Total Cleanup
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
btd
da36e27b57
Every time i forgot this
2010-09-12 00:57:30 +04:00
GreYFoXGTi
f6f7699ef1
btd Fixed compiling
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-24 14:46:44 +02:00
oy
7503c64237
made unpacking of net strings more strict - prevents possible malformed output
2010-08-12 15:22:07 +02:00
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00
Magnus Auvinen
123c5b5b99
introduced 3 special pseudo weapons. game, self and world to make a difference on how you got killed
2009-01-12 21:41:16 +00:00
Magnus Auvinen
46125d5ed7
fixed so predicted sounds and air jump effect works with demo playback
2009-01-11 15:51:43 +00:00
Magnus Auvinen
388a04d957
better voting support
2008-11-08 12:50:46 +00:00
Magnus Auvinen
c995aff8e3
fixed input state mask, missed one bit that could make the server hang itself
2008-10-18 20:50:42 +00:00
Magnus Auvinen
9d1c56e2fd
adjusted the sv_killmsg to account for death tiles
2008-10-18 18:02:51 +00:00
Magnus Auvinen
35bcd41aa2
added hammer hit effect. added reset of all systems on state change. solves a lot of possible memory errors
2008-10-17 11:23:21 +00:00
Magnus Auvinen
3544db4927
fixed #490 (insert the player info in the sv_setinfo message into the snapshot instead)
2008-10-08 20:47:56 +00:00
Magnus Auvinen
eac9658b73
added voting gui and a lot of other minor changes
2008-09-29 11:34:49 +00:00
Magnus Auvinen
aaaba4f403
continued on the voting
2008-09-25 12:23:44 +00:00
Magnus Auvinen
917ebc17c6
begun the work on voting
2008-09-24 14:47:03 +00:00
Magnus Auvinen
33b50738e6
added dead reckoning to the characters
2008-09-23 07:43:41 +00:00
Alfred Eriksson
6a4e17ea85
added round number to the scoreboard
2008-09-07 15:07:08 +00:00
Magnus Auvinen
4fb71c1bca
fixed order of pickup ids
2008-09-04 21:54:21 +00:00
Magnus Auvinen
0a48454a55
removed the GAMETYPE_ enum
2008-08-31 14:37:35 +00:00
Magnus Auvinen
b322643f17
missed some files
2008-08-27 15:51:09 +00:00
Magnus Auvinen
a13b94f9e0
minor update
2008-07-08 09:07:21 +00:00
Magnus Auvinen
3705064b10
renamed .h to .hpp in game because they are c++ headers
2008-06-12 12:09:34 +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