GreYFoX
|
c46f3e06e7
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
|
2012-01-04 20:10:07 +02:00 |
|
Magnus Auvinen
|
c1942ca6cb
|
fixed the render frame time and cleaned up some more code
|
2012-01-01 13:38:46 +01:00 |
|
|
GreYFoX
|
35d16bd58c
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
Conflicts:
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/engine/shared/network_server.cpp
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/menus_browser.cpp
src/game/client/gameclient.cpp
src/game/editor/editor.cpp
src/game/editor/editor.h
src/game/editor/io.cpp
src/game/editor/layer_tiles.cpp
src/game/editor/popups.cpp
src/game/gamecore.cpp
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
src/game/variables.h
|
2011-08-13 02:01:40 +02:00 |
|
oy
|
571dff6216
|
made rcon auto completion serverside. Closes #97
|
2011-07-14 22:07:21 +02:00 |
|
|
oy
|
123eab41c8
|
made it possible to filter by player country in the server browser. Closes #654
|
2011-06-29 22:27:32 +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 |
|
|
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
|
79aa9d640e
|
fixed that server browser shows the correct country flag
|
2011-03-20 11:15:24 +01:00 |
|
|
oy
|
a8bf857c68
|
improved server browser list resorting and made search work on IP addresses. Closes #482
|
2011-03-18 19:03:13 +01:00 |
|
|
oy
|
4f91026a01
|
added an editor function to show tile informations (index, flip/rotate status)
|
2011-02-18 11:41:27 +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
|
24a688b2c3
|
Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother
|
2011-02-04 22:15:02 +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 |
|
|
oy
|
216967c3bf
|
release gameclient components when opening the editor. Closes #429
|
2011-01-17 12:28:37 +01:00 |
|
|
oy
|
41b8022aa1
|
record a new demo when a game ends. Closes #358
|
2011-01-06 23:21:51 +01:00 |
|
|
oy
|
c75a75b64f
|
made it possible to automatically take game over screenshots. Closes #339
|
2010-12-12 16:48:13 +01:00 |
|
|
oy
|
db9dd6b8c9
|
added an optional time stamp to a demo record by Batchyx
|
2010-12-08 00:42:32 +01:00 |
|
|
oy
|
bd9850cae2
|
added single function to stop recording by Batchyx
|
2010-12-08 00:02:24 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
|
oy
|
3a98f7a048
|
added mod system. Closes #34
|
2010-10-06 23:07:35 +02:00 |
|
|
oy
|
3797eba179
|
added demo recording button by fujnky
|
2010-08-09 14:14:15 +02:00 |
|
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|