def
|
fff4b4a677
|
Make OS X run without freetype dependency (by HMH)
|
2014-03-28 12:40:07 +01:00 |
|
def
|
5bfda18aea
|
OS X server changes
|
2014-01-16 20:23:00 +01:00 |
|
def
|
c90568ce71
|
Support for 9th mouse key (by Tolsi)
|
2014-01-14 20:33:18 +01:00 |
|
def
|
a8ea0785d8
|
New icon for Mac OS X version
|
2013-12-31 13:34:15 +01:00 |
|
def
|
f08f143fe7
|
update make_release.py
|
2013-12-30 19:49:19 +01:00 |
|
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 |
|
oy
|
614020de6e
|
fixed make_release script on win64
|
2013-05-02 00:38:32 +02:00 |
|
Shereef Marzouk
|
6f7d6c4c8d
|
Added try catch block to deal with languages dir not found
|
2013-02-01 21:52:27 +02:00 |
|
Ravomavain
|
4481eabcc5
|
remove banmaster from sources
|
2012-05-01 21:57:09 +02:00 |
|
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
|
4dfa00a2f1
|
made make_release script get and add the latest translations and clean up the temporary stuff
|
2012-02-05 17:20:57 +01:00 |
|
oy
|
357be91c6b
|
removed language files
|
2012-02-05 17:06:07 +01:00 |
|
oy
|
96c66c95e9
|
updated build script to the new repo
|
2012-01-12 01:16:34 +01:00 |
|
Shereef Marzouk
|
c496bf3c4e
|
Merge branch 'master' of https://github.com/oy/teeworlds into DDRace
Conflicts:
bam.lua
scripts/make_release.py
|
2011-12-14 17:01:47 +02:00 |
|
Krzysztof Socha
|
242e551142
|
changed make_release.py script, so it can correctly create universal binary on all architectures
|
2011-12-10 18:13:03 +01:00 |
|
GreYFoX
|
35d16bd58c
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
Conflicts:
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/engine/shared/network_server.cpp
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/menus_browser.cpp
src/game/client/gameclient.cpp
src/game/editor/editor.cpp
src/game/editor/editor.h
src/game/editor/io.cpp
src/game/editor/layer_tiles.cpp
src/game/editor/popups.cpp
src/game/gamecore.cpp
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
src/game/variables.h
|
2011-08-13 02:01:40 +02:00 |
|
oy
|
de05682d87
|
fixed play hooking when tune player_collision is 0. Closes #825
|
2011-08-06 13:57:59 +02:00 |
|
oy
|
9e5ead2fbd
|
fixed nethash
|
2011-07-30 22:30:26 +02:00 |
|
oy
|
571dff6216
|
made rcon auto completion serverside. Closes #97
|
2011-07-14 22:07:21 +02:00 |
|
Choupom
|
d6f34cbaba
|
updated tw_api.py for 0.6 and improved it
|
2011-06-27 16:45:55 +02:00 |
|
oy
|
9efa0e3f63
|
fixed nethash 4 real
|
2011-06-09 23:28:40 +02:00 |
|
oy
|
b48c59225a
|
fixed nethash
|
2011-06-09 22:19:01 +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 |
|
Sworddragon
|
baa2e650a5
|
Set the root directory of teeworlds as the main directory for scripts
|
2011-05-09 17:29:40 +02:00 |
|
Sworddragon
|
1850851a47
|
Fixed directory changing
|
2011-05-09 17:29:37 +02:00 |
|
GreYFoX
|
0d61c87fa1
|
Added 0.6.0 banmaster by @heinrich5991 #31
|
2011-04-26 11:51:02 +02:00 |
|
GreYFoX
|
8e521aec03
|
forgot this
|
2011-04-15 07:12:11 +02:00 |
|
GreYFoX
|
2a37807879
|
Disabled Mac Sql Release by defaule, users who need it must compile with server_sql_release
|
2011-04-15 07:02:02 +02:00 |
|
GreYFoX
|
1bdb85f334
|
fixed make_release.py for mac
|
2011-04-15 04:48:20 +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
|
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 |
|