GreYFoX
|
cd4ba53bae
|
Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
Conflicts:
bam.lua
scripts/build.py
scripts/make_release.py
src/engine/server.h
src/game/client/gameclient.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/player.cpp
src/game/version.h
|
2012-04-12 02:09:31 +02:00 |
|
oy
|
b592d7a591
|
cleaned up playing of global sounds
|
2012-01-06 19:38:40 +01:00 |
|
|
GreYFoX
|
ff696bad6c
|
Mac Loves Cyclic Includes
|
2011-08-31 13:56:04 +02:00 |
|
|
GreYFoX
|
5b27758650
|
Removed level stuff
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
|
2011-08-13 02:11:06 +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
|
7f15b3ac57
|
fixed several stuffs
|
2011-05-03 19:25:11 +02:00 |
|
|
GreYFoX
|
9397c4a55f
|
some make release changes for adding sql server files
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
|
2011-04-15 04:32:53 +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
|
9643fc36ae
|
added new hammer hit effect by SushiTee and Crises
|
2011-04-08 19:11:41 +02:00 |
|
|
oy
|
0bc13c91eb
|
made cl_threadsoundloading work again
|
2011-02-27 17:56:03 +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 |
|
SushiTee
|
c0b905f852
|
-fixed compiler warnings
-fixed mac compiling
|
2011-01-26 14:45:44 +02:00 |
|
|
oy
|
39b531452a
|
fixed colour of the particles when a tee dies. Closes #331
|
2010-12-07 23:54:25 +01:00 |
|
|
oy
|
e6698b1118
|
apply custom colour to blood colour. Closes #314
|
2010-11-24 01:11:56 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01: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 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
Alfred Eriksson
|
c24b5f11f2
|
fixed spawn sound
|
2009-01-21 11:56:41 +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
|
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
|
b03b048974
|
removed gc_client.hpp
|
2008-08-30 21:09:13 +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 |
|