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
43a6c02263
fixed the nethash
2011-04-13 20:48:50 +02:00
oy
e6f0318bdf
added "fixed some header guards and added a script to fix them all!" by Choupom
2011-04-13 20:22:10 +02:00
oy
1a5d70450f
added "reimplemented menu music by teetow-the-great-teetow" by Choupom
2011-04-13 20:00:54 +02:00
GreYFoX
989d69a5b2
Mac make_release changes
2011-04-13 01:35:13 +02:00
GreYFoX
4a46168631
Temporarily removed crash features til it's fixed, made version 1.071a
...
changed some names for the build bot to work
2011-04-12 03:52:01 +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
84f7b063d5
removed a former commit which created problems
2011-04-03 23:20:00 +02:00
Sworddragon
c5681b3884
Fixed incremental building
2011-04-03 22:34:38 +02:00
Sworddragon
e3a2d656f1
Fixed Python 3 support
2011-04-03 22:34:04 +02:00
Sworddragon
3e6b77b040
Added/fixed directory changing
2011-04-03 22:33:47 +02:00
oy
ceb7339006
updated make_release script so it copies over the freetype.dll. Closes #563
2011-04-01 17:22:15 +02:00
GreYFoX
974f429957
Added git revision to several places
2011-03-18 01:21:07 +02:00
oy
b59c710eba
changed netversion to 0.6
2011-02-16 11:32:40 +01:00
GreYFoXGTi
718d697707
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/collision.cpp
src/game/collision.h
src/game/gamecore.cpp
src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
oy
3c7adc6a7f
fixed nethash
2011-02-13 13:06:19 +01:00
oy
127fca31f2
fixed nethash
2011-02-12 22:29:24 +01:00
root
75f854584d
Fixed wrong nethash creation with Python 3
2011-02-09 12:39:29 +01:00
GreYFoXGTi
d7e4153ec4
Added banmaster by heinrich5991
2011-02-07 08:25:38 +02:00
GreYFoXGTi
df84671d38
Renamed a file and added it to make_release.py
2011-02-05 01:49:54 +02:00
GreYFoXGTi
3da1860654
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
2011-02-04 18:54:54 +02:00
oy
b5b33b45fa
added more python 3 support by Sworddragon
2011-01-29 20:00:39 +01:00
oy
9c6843946c
added Python 2.5 - Python 3.2 support by Sworddragon
2011-01-29 18:55:21 +01:00
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
3c1eee2a12
reverted Python 3 support fixes to keep compatibility with 2.5
2011-01-20 01:28:17 +01:00
fisted
372b62566b
fixed tower bug
2011-01-20 00:15:18 +01:00
oy
232aafa891
added Python 3 support fixes by Sworddragon
2011-01-17 15:48:57 +01:00
GreYFoXGTi
2ec0e0eec4
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/console.cpp
src/game/client/components/hud.cpp
src/game/client/components/scoreboard.cpp
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
2011-01-12 11:08:17 +02:00
Sworddragon
5483eb6629
Fixed encoding error
2011-01-12 01:38:49 +01:00
GreYFoXGTi
6889adc0bb
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
.gitignore
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
oy
e71263d686
fixed last commit
2011-01-06 12:41:24 +01:00
Sworddragon
4ff61fcdaa
Made compiling process Python 3 compatible
2011-01-06 12:27:50 +01:00
GreYFoXGTi
ddc5dd7ab3
Cleaned up & Re-arranged stuff
2011-01-06 05:46:10 +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
a72848e780
added constants for teams by Choupom
2011-01-03 12:50:38 +01:00
GreYFoXGTi
41236a3413
Merge branch 'master' of http://github.com/oy/teeworlds
2010-12-22 13:42:36 +02:00
oy
26546585f7
fixed path for make_release in build.py
2010-12-22 12:34:48 +01:00
GreYFoXGTi
5b56598056
Edited build.py for DDRace
2010-12-16 06:36:18 +02:00
GreYFoXGTi
e803f30f52
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/entities/character.cpp
src/game/server/entities/flag.cpp
src/game/server/player.cpp
src/game/variables.h
2010-12-16 06:06:23 +02:00
oy
c6848cd229
fixed build.py on windows
2010-12-16 03:14:31 +01:00
Sworddragon
9852ec658c
Updated build.py
2010-12-16 03:08:45 +01:00
GreYFoXGTi
38dfcff6b5
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
2010-12-11 21:35:44 +02:00
oy
f3c411f730
added directory enhancement for update_localization.py by Sworddragon
2010-12-11 20:29:24 +01:00
GreYFoXGTi
46c2225d60
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
scripts/make_release.py
src/engine/shared/config_variables.h
2010-12-11 21:28:43 +02:00
GreYFoXGTi
6620da58d3
used name variable to strings that include teeworlds statically
2010-12-11 19:29:44 +01:00
GreYFoXGTi
ec1a546ebd
fixed make_release.py looking for default.bam instead of bam.lua and configure.lua
2010-12-11 19:27:15 +01:00
GreYFoXGTi
a9ce77c9da
Fixed make_release.py
2010-12-05 19:28:55 +02:00
oy
5fcb63d325
fixed last commit
2010-11-21 00:48:47 +01:00
Choupom
7ad1d60805
updated update_localization.py by Sworddragon
2010-11-21 00:28:13 +01:00
