Choupom
|
84e5c53432
|
added color envelope feature for tilemaps
|
2011-07-20 22:04:13 +02:00 |
|
GreYFoX
|
cc63cf2553
|
Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
src/engine/external/pnglite/pnglite.c
src/engine/external/pnglite/pnglite.h
src/engine/shared/config_variables.h
src/game/client/components/menus_browser.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/version.h
|
2011-05-09 18:36:13 +02:00 |
|
|
Choupom
|
7b87cfa68a
|
made envelopes synchronized with other clients
|
2011-05-03 18:12:32 +02:00 |
|
|
GreYFoX
|
d0ed9612e1
|
Properly done cl_show_entities
|
2011-04-19 16:32:42 +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 |
|
|
GreYFoX
|
87cde802b1
|
Added a new entities_clear
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
|
2011-03-16 19:48:16 +02:00 |
|
|
GreYFoX
|
3bae74f21d
|
Added Ability to predict old hook through tiles from DDMax
fixed a warning
|
2011-03-16 17:36:54 +02:00 |
|
|
GreYFoX
|
ee178d5a48
|
Client Cheat showing entities in game
|
2011-03-16 14:48:16 +02:00 |
|
|
GreYFoXGTi
|
7455ebfee9
|
I had a crash here, dunno why!
|
2011-02-17 11:24:11 +02:00 |
|
|
GreYFoXGTi
|
f83132448d
|
Merged Oy, Isolated Freeze from Deep Freeze
|
2011-02-13 19:32:06 +02: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
|
336f00ae89
|
added colours for tile layers by Choupom
|
2011-01-04 11:38:14 +01:00 |
|
|
GreYFoXGTi
|
5d9ee1736e
|
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
|
2010-11-22 00:26:00 +02:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
|
GreYFoXGTi
|
abafbdd919
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-20 01:19:06 +02:00 |
|
SushiTee
|
314cda05c7
|
changed demo animations according to demo speed and added some demo speeds. (fixes #206)
|
2010-10-19 18:52:16 +02:00 |
|
btd
|
1f0e49c080
|
Add my old zoom staff
|
2010-10-17 12:43:27 +04:00 |
|
|
oy
|
3a98f7a048
|
added mod system. Closes #34
|
2010-10-06 23:07:35 +02:00 |
|
|
oy
|
5ff7836638
|
fixed problems with the tilelayer dumping. Closes #86. Closes #149
|
2010-09-07 02:06:11 +02:00 |
|
xalduin
|
dc3feaf42c
|
Fixed remaining compiler warnings for gcc on Linux
|
2010-06-10 20:38:03 +08:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
|
Magnus Auvinen
|
878ede3080
|
major update with stuff
|
2009-10-27 14:38:53 +00:00 |
|
Alfred Eriksson
|
2d4f6dffb9
|
fixed a weird bug causing game layer to be rendered wrong
|
2009-01-17 22:19:13 +00:00 |
|
|
Alfred Eriksson
|
783cc0d2b7
|
fixed #625
|
2009-01-12 14:43:39 +00:00 |
|
|
Alfred Eriksson
|
47e50c5f20
|
added gfx_noclip to disable clipping
|
2008-11-17 16:04:46 +00:00 |
|
|
Magnus Auvinen
|
d15860e44f
|
renamed gc_render* to render*
|
2008-10-20 23:46:39 +00:00 |
|
|
Magnus Auvinen
|
12472ef7f4
|
major update. continued on ban support. added demo recording (client and server side). added demo player. added demo menu. demos have some quirks and file size optimizations havn't been done yet. some interface tweaks
|
2008-10-06 18:05:01 +00:00 |
|
|
Magnus Auvinen
|
9c704c6a05
|
added mapimages component
|
2008-09-01 05:54:00 +00:00 |
|
|
Magnus Auvinen
|
9672fe674f
|
fixed so you can disconnect and reconnet without crashing
|
2008-08-30 09:16:29 +00:00 |
|
|
Magnus Auvinen
|
dfe499248f
|
major commit. game client restructure. not complete, loads of stuff not working, but the structure is there
|
2008-08-27 15:48:50 +00:00 |
|