GreYFoXGTi
|
2151883b43
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/gamecore.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/pickup.cpp
src/game/server/entities/projectile.cpp
src/game/server/entity.h
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/variables.h
|
2011-01-20 16:10:32 +02:00 |
|
oy
|
19a9462fe8
|
removed double entity list in gameworld and cleaned up connected stuff
|
2011-01-19 18:27:50 +01:00 |
|
|
oy
|
1359db5476
|
prevent that removing an entity aborts traversing the entity list in gameworld
|
2011-01-19 15:31:42 +01:00 |
|
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +02: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
|
806046fe76
|
Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
src/game/server/entities/dragger.cpp
src/game/server/gamecontext.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-22 03:02:49 +03:00 |
|
btd
|
2af441b703
|
Finish super team, fix bug with killing, DDraggers not finished
|
2010-09-21 23:09:11 +04:00 |
|
|
GreYFoXGTi
|
427fedb79b
|
Starting to fix Doors
hitted is not a word :p
forgot to change from bool to int
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-16 23:33:16 +03:00 |
|
|
btd
|
7ed685ee11
|
Merge
|
2010-09-11 13:42:35 +04:00 |
|
|
GreYFoXGTi
|
72e05efc53
|
Added Evil Teleporter,
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-11 02:01:15 +02:00 |
|
|
btd
|
4eadf3029b
|
Finish doors. Door hits all characters, check on activating team and send in snapshot only needed information
|
2010-09-01 12:52:59 +04:00 |
|
|
GreYFoXGTi
|
ab3f4b6a15
|
made return type bool
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-08-31 15:22:54 +02:00 |
|
|
GreYFoXGTi
|
4dcf0d8d3b
|
found an easier and better way :) with much much less processing
tested and working well
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-08-31 15:19:01 +02:00 |
|
|
btd
|
e396813e32
|
Add new method which find all characters on line. Fix bug of doors, need to test
|
2010-08-31 15:01:46 +04:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|