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
Sworddragon
d7b623f532
Updated copyright.py
2010-11-20 21:23:28 +01:00
oy
3a98f7a048
added mod system. Closes #34
2010-10-06 23:07:35 +02:00
oy
d9a3cc032f
updated refactor script and fixed a thing
2010-08-12 19:03:03 +02:00
Magnus Auvinen
fe5a7105c4
fixed the automatic versioning
2010-05-29 15:20:18 +00:00
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00
Magnus Auvinen
b3c1bae2e9
cleaned up localization. fixed motd so it shows when connecting to a server
2009-06-15 09:46:25 +00:00
Magnus Auvinen
ab171f8f30
updated localization
2009-06-15 07:34:25 +00:00
Magnus Auvinen
bc20e9c433
localization update
2009-06-13 17:18:06 +00:00
Magnus Auvinen
6d9ccee95d
base for the localization system
2009-06-13 16:54:04 +00:00
Magnus Auvinen
d754cd9d19
updated cmd5.py
2009-06-07 14:40:58 +00:00
Magnus Auvinen
24899a13e8
improved the prediction timer to handle crappy connections better
2009-01-21 00:05:07 +00:00
Joel de Vahl
1d6668583a
initial server launcher for osx
2009-01-12 20:04:14 +00:00
Johan Althoff
7179e467a6
added SDL.dll to the make_release.py
2009-01-11 12:59:54 +00:00
Alfred Eriksson
67f4910e86
reverted unnecessary changes
2009-01-11 12:53:06 +00:00
Alfred Eriksson
7bdead04e7
adds SDL.dll to the release
2009-01-11 12:49:14 +00:00
Alfred Eriksson
ab7ecbcf3f
fixed path
2009-01-11 12:42:00 +00:00
Magnus Auvinen
144b9fbb6b
updated build scripts
2009-01-11 12:35:37 +00:00
Joel de Vahl
2a7402dd6c
use dmg for osx deliver, build universal binary, fix backspace being entered as a character
2009-01-11 12:10:30 +00:00
Magnus Auvinen
b281831d5d
fixed more reliable tw_api.py script
2009-01-10 10:25:27 +00:00
Magnus Auvinen
42553448f7
fixed so it handles multiple packets from the masters
2008-11-16 14:01:40 +00:00
Magnus Auvinen
8acf5ed788
upgraded the master server code so it can handle more servers
2008-11-15 13:29:56 +00:00
Magnus Auvinen
bd5b2b9f85
removed glfw and portaudio. SDL is now a requirement
2008-10-23 16:18:33 +00:00
Joel de Vahl
21445b67bb
use system installed sdl on osx
2008-10-21 16:16:16 +00:00
Joel de Vahl
8edfa80028
Use SDL on OSX
2008-10-21 15:59:32 +00:00
Magnus Auvinen
8404143afe
added SDL support
2008-10-20 17:47:42 +00:00
Magnus Auvinen
4484948a6d
updated the demo recorder
2008-10-14 12:11:42 +00:00
Joel de Vahl
b74c2b7931
Initial launcher (again)
2008-10-08 16:33:08 +00:00
Magnus Auvinen
6d44adb711
fixed keybindings. reworked the voting a bit. added vote spamming protection. added ingame voting hud.
2008-09-25 14:04:02 +00:00
Magnus Auvinen
a13b94f9e0
minor update
2008-07-08 09:07:21 +00:00
Magnus Auvinen
f6c67c29cd
large commit with loads of clean up. more is comming
2008-06-12 10:51:48 +00:00
Magnus Auvinen
ac18c6a3bd
more stuff :)
2008-04-27 05:59:38 +00:00
Magnus Auvinen
a7cb36877c
commited the small thing that I had before I reinstall my machine
2008-04-27 05:56:56 +00:00
Magnus Auvinen
171d6b1c20
added the tw_api.py
2008-03-24 22:59:11 +00:00
Magnus Auvinen
3fbdaaa11e
updated build.py
2008-03-22 19:33:45 +00:00
Magnus Auvinen
96eebfb207
minor fixes
2008-03-22 19:19:56 +00:00
Magnus Auvinen
bc108df382
renamed everything. added the new license
2008-03-22 18:40:27 +00:00
Joel de Vahl
5cf37c874a
Do not use bundle in OSX for now
2008-03-22 15:12:00 +00:00
Joel de Vahl
ddca01abb6
OSX fixes
2008-03-22 15:09:49 +00:00
Magnus Auvinen
511720b0e4
loads of minor fixes here and there. fixed invalid corrections and stuff like that
2008-03-17 22:36:03 +00:00
Magnus Auvinen
8cb74cfabe
added more checking to the messages
2008-03-17 21:55:33 +00:00
Magnus Auvinen
c4e165f395
reworked the whole message system
2008-03-17 21:31:46 +00:00
Magnus Auvinen
9e84f8d01f
compile fix, no static on securefunc typedef
2008-03-13 00:02:12 +00:00
Magnus Auvinen
f685b413d2
fixed compile errors
2008-03-10 11:06:37 +00:00
Magnus Auvinen
91eda24ddc
fixed correction count. fixed miss-behaving server
2008-02-24 18:41:02 +00:00
Magnus Auvinen
4739966e14
larger restructure to improve security
2008-02-24 16:03:58 +00:00
Jakob Fries
4edf650a50
font cleanup
2008-01-19 16:49:24 +00:00
Magnus Auvinen
dd21ae1bc7
large commit. documented a bit. editor updates. general cleanup of everything
2008-01-19 10:57:25 +00:00
Jakob Fries
cd6d5e6237
new fonts added, lots more magic font code added, server bug fixed
2007-12-25 03:25:13 +00:00
Jakob Fries
a02611511c
more font stuffs
2007-12-24 13:09:34 +00:00
Jakob Fries
1ddfbba366
add new font stuff
2007-12-22 02:55:19 +00:00
Joel de Vahl
5669c11a0b
start teewars by default on osx, no launcher yet
2007-12-19 21:32:58 +00:00
Joel de Vahl
afc7cc4cc2
updated build.py
2007-12-19 20:57:50 +00:00
Joel de Vahl
c93dbcaa53
Initial server launcher for osx.
2007-12-19 18:47:47 +00:00
Magnus Auvinen
b2aa4add16
fixed build.py
2007-12-15 15:16:15 +00:00
Joel de Vahl
190dbacfd0
fixed make release for osx
2007-12-15 15:01:26 +00:00
Magnus Auvinen
bc3b1d0534
updated ctf2 and build scripts
2007-12-15 14:48:12 +00:00
Magnus Auvinen
83d82aa6ac
updated the scripts a bit
2007-12-15 14:40:39 +00:00
Joel de Vahl
bff504662c
Make releasefor osx.
2007-12-15 13:01:09 +00:00
Joel de Vahl
a3c5960ffe
Initial OSX release scripts.
2007-12-15 11:44:27 +00:00
Magnus Auvinen
a2566b3ebd
cleaned up code structure a bit
2007-12-15 10:24:49 +00:00
Johan Althoff
f390f99142
modified the make_release.py to include the config_directory.bat on windows.
2007-12-13 18:46:43 +00:00
Magnus Auvinen
0496221e60
fixed error in make release
2007-12-12 22:07:42 +00:00
Magnus Auvinen
a1b69192e8
added build scripts
2007-12-12 21:53:06 +00:00
Magnus Auvinen
f7ea0b2ba8
loads of minor stuff
2007-12-12 19:52:57 +00:00