def
|
3eaad43b6b
|
Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
Conflicts:
bam.lua
data/languages/index.txt
src/engine/server/server.cpp
src/engine/shared/network_server.cpp
src/game/client/components/chat.cpp
src/game/client/components/menus_settings.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/version.h
|
2013-12-26 18:02:22 +01:00 |
|
|
def
|
ad724453ad
|
Better fix for slow Map loading
|
2013-12-20 12:27:10 +01:00 |
|
|
def
|
06fed6e596
|
Disable Tilemap Skip Generation (Makes map loading 30 times faster)
|
2013-12-20 03:33:50 +01:00 |
|
oy
|
e291a60e7e
|
fixed map initialisation. Closes #64
|
2013-02-24 17:09:42 +01:00 |
|
GreYFoX
|
1446d0980b
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
* Version 1.098a
Conflicts:
bam.lua
src/game/client/gameclient.h
src/game/mapitems.h
|
2011-12-05 11:32:01 +02:00 |
|
Choupom
|
873c5a77bc
|
some trivial fixes
|
2011-12-04 14:21:20 +01:00 |
|
|
GreYFoX
|
bee10fda8f
|
Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
src/game/server/gamecontext.cpp
|
2011-06-02 19:13:40 +02:00 |
|
|
Choupom
|
603071ee92
|
fixed data struct names
|
2011-06-02 17:42:30 +02:00 |
|
|
GreYFoX
|
4c11e9460b
|
added "fixed brush rotating and flipping for tele and speeduplayer" by SushiTee
|
2011-04-17 18:00:01 +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
|
6205583d64
|
added fix so that the ghost is alpha blended
|
2011-03-07 10:06:19 +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 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
|
oy
|
05f3757491
|
added optimisations by sworddragon
|
2010-08-05 20:55:51 +02: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 |
|
|
Magnus Auvinen
|
d15860e44f
|
renamed gc_render* to render*
|
2008-10-20 23:46:39 +00:00 |
|