edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-15 04:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
20861 commits 1 branch 429 tags 412 MiB
Commit graph

404 commits

Author SHA1 Message Date
def 2d8a1ee2b7 Make fix_style.py look at files, not lines 2020-09-26 21:41:20 +02:00
def 3daa798639 Implement script/languages support for contexts 2020-09-15 10:30:49 +02:00
heinrich5991 b235637713 Find the common ancestor for the style checking 
This allows the style checker to only look at the changes done in the
current branch, and not the other commits that were done in the base
branch.
 2020-09-11 00:57:03 +02:00
def ecdf648930 Make fix_style executable 2020-09-10 22:58:30 +02:00
heinrich5991 df46ff8557 Add a tools to fix the style of new pull requests 2020-09-10 04:11:58 +02:00
def 63f6ecd19d Ignore duplicate records when inserting (fixes #2636) 2020-08-29 08:26:03 +02:00
Zwelf ca24611c0c Do not recommend to deleting ddnet-server.sqlite database 
as it might be still in use or there might be even new ranks added to the database
 2020-08-12 23:38:09 +02:00
Zwelf 9848b3c759 SQLite transfer script: Warn if database does not exist yet and handle partially created sqlite tables 2020-08-12 23:38:09 +02:00
Zwelf 7834c2c1d8 Add file score import script by heinrich5991 2020-08-03 12:58:52 +02:00
Zwelf e483011df6 Add script to move SQLite ranks to MySQL 2020-08-03 12:58:52 +02:00
def 59cf78be24 Always recreate the language files in same order 
Alphabetically as the files are located in directory structure.

Keeps the language files more stable
 2020-06-30 21:38:14 +02:00
def 2d581e0612 copy_fix: Don't generate comment line, just add missing translations at the end 2020-06-26 23:28:44 +02:00
def 2d6e56fec8 Translation fixes 
- Code didn't work with newlines, get rid of them
- Some stylistic improvements
 2020-06-26 18:34:50 +02:00
def f925822c5e Add instructions for translation stats 2020-06-25 22:12:35 +02:00
Learath 09fad44b87 Strip rpath before adding the correct one 2020-04-30 15:04:51 +02:00
def 31ae4c4d5a use pid in file names of temporary files 
to prevent race conditions with multiple clients running when saving
maps, config on quit, during upgrade
 2020-02-12 23:14:30 +01:00
heinrich5991 96069f42a9 Add a script to generate a stub libcurl library 
Linking to this library will make DDNet compatible with all distros that
ship libcurl.so.4 with arbitrary version data attached. Distros
sometimes add versioning information to the symbols exported by curl
that artificially (because they're compatible with each other) limit
where our releases can be executed if dynamically linked.

This should reduce release size a bit and let's us take advantage of
automatically updated libraries.
 2020-01-05 17:58:52 +01:00
Dennis Felsing 0498df2508 Update localizations (Thanks to Cellegen for report) 
- Remove duplicate laser entries
- Update menus_settings.cpp comment for scripts
- Update instructions for scripts
- Run script to get updated localizations
 2019-12-02 09:09:01 +01:00
def 94f3d97ddf Remove unmaintained Android code (fixes #1575) 2019-04-10 19:40:50 +02:00
def faa3cc195d UTF8 nocase compare & use for chat TAB completion 
- As suggested by Arseniy Zarche
- Also updated confusables to Unicode 12
 2019-01-09 08:31:03 +01:00
12pm d46a5c7994 Fix output for usernames with double quotes and semicolons 2018-11-15 18:30:44 +01:00
12pm 59334a7068 Fix output for usernames with spaces 2018-11-10 13:52:13 +01:00
heinrich5991 41d0f86b12 Use __file__ instead of sys.argv[0] 
Thanks to @bojidar-bg for the hint.
 2018-07-25 09:17:10 +02:00
heinrich5991 945ea1cf28 Make language scripts callable from anywhere 2018-07-25 09:17:09 +02:00
heinrich5991 3a8cc43e13 Move language scripts to scripts/ 2018-07-25 00:34:02 +02:00
yangfl 81a39c229b Fix typo 2018-07-10 17:29:02 +08:00
heinrich5991 925aff21d4 Fix all the header guards and adjust the script a little 2018-07-06 16:11:38 +02:00
heinrich5991 d7f30c574f Update scripts/check_header_guards.py 
Python 3 compatibility, return code, changing directory before script
starts.
 2018-07-06 15:45:05 +02:00
heinrich5991 f46f811280 Remove a bunch of unused scripts 
scripts/compiler.py: Looks like an older version of datasrc/datatypes.py
scripts/copyright.py: Checks copyright headers in files
scripts/count_source.sh: Counts source files, from SVN(!) times
scripts/dat2c: Writes a C constant with the contents of a file
scripts/font_converter.py: Conversion tool for an old font format
scripts/font_installer.sh: Calls the conversion tool on all fonts
scripts/linecount.sh: Counts source code lines (using `wc` and `find`)
scripts/make_docs.sh: Generates source code docs that haven't existed for a long time
scripts/mass_server.py: Starts a lot of `fake_server`
scripts/netobj.py: Looks like an older version of datasrc/datatypes.py
scripts/nicks.txt: Auxiliary file for scripts/mass_server.py
scripts/png.py: Conversion of image file formats
scripts/process_blame.py: SVN-era source count
 2018-07-06 15:14:13 +02:00
heinrich5991 6d88a29910 Add LATIN SMALL LETTER L confusable 
This makes `LATIN SMALL LETTER L` confusable with `LATIN SMALL LETTER I`
because `CYRILLIC SMALL LETTER PALOCHKA` "ӏ" (mapping to i) wasn't
confusable with `LATIN SMALL LETTER L` "l" (mapping to l) before.

Also add tests for `str_utf8_comp_confusable`.
 2018-03-20 21:11:44 +01:00
heinrich5991 565f963a7b Properly hide stderr in scripts/git_revision.py 2018-03-02 03:31:45 +01:00
heinrich5991 b285d777f3 Python 2 support for scripts/git_revision.py on error /o\ 2018-03-02 03:22:44 +01:00
heinrich5991 1387ee9a3a Regenerate version file on git changes 
Previously, this file had to be manually deleted if you wanted to have a
new version compiled in.
 2018-03-01 16:50:29 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
Dennis Felsing efe053033b Remove make_src.py 2018-01-29 14:38:42 +01:00
Learath2 050a34295f Remove make_release, scrub references to lua files 2018-01-29 13:37:26 +01:00
Learath2 b26eeb235d Scrub more references to bam 2018-01-28 22:47:03 +01:00
bors[bot] a2f010c1fe Merge #941 
941: Add cross-compiled DMG archives r=Learath2 a=heinrich5991

Currently they only contain the client and the archives are a lot larger
than the current release artifacts.
 2017-12-08 14:20:49 +00:00
heinrich5991 3620e234db dmg.py: Add proper size calculation 2017-11-16 10:03:11 +01:00
heinrich5991 2f0b76f178 dmg.py: Compatibility with Python 3.2 and below 2017-11-16 00:11:30 +01:00
heinrich5991 eb6c8ea101 Allow DMG creation on macOS via hdiutil 2017-11-09 13:35:59 +01:00
heinrich5991 2593091380 Preliminary version of cross-compiled DMG archives 
Currently they only contain the client and the archives are a lot larger
than the current release artifacts.
 2017-11-09 00:16:52 +01:00
heinrich5991 17d3f4afa4 Put shaders into the data/ directory 
Simplifies a lot of things
 2017-11-08 22:19:47 +01:00
def 342c6048bf Use new opengl by default 2017-10-20 22:47:59 +02:00
Dennis Felsing 03ec3c0145 No glew32.dll 2017-10-20 13:41:30 +02:00
Dennis Felsing 96bad9f3f2 Add glew32.dll on Windows 2017-10-20 09:01:22 +02:00
heinrich5991 6ef9c8dbcd First working version of teehistorian 
teehistorian records all inputs from the players as well as the player
positions in each tick. It stores this info in a highly compressible
output format (I've achived 5x compression using xz or bz2).
 2017-09-20 02:16:11 +02:00
def c53f39c434 Let's try the nicer dll names on windows 2017-07-21 23:43:01 +02:00
def b57ffa429e Use scancodes instead of keycodes for input (fixes #796, please test) 2017-07-21 19:53:49 +02:00
def 41d9de997c ddnet-libs submodule and some fixes 2017-07-20 23:07:15 +02:00
def a72910bb4e Move external libraries to ddnet/ddnet-libs repo 2017-07-19 21:51:47 +02:00
def ed3b3f94c4 Further build fixes 2017-07-17 00:34:11 +02:00
def b1b4aa78ea Windows build fixes 2017-07-17 00:17:22 +02:00
def f94f567acf New curl and openssl versions 2017-07-16 23:52:55 +02:00
def 8580aa6b6c Bundle map_diff on OSX 2017-07-15 19:13:38 +02:00
def 8b111ab6c3 Distribute map_diff 2017-07-12 20:31:02 +02:00
def 66f6f16e81 Windows DPI fixes #2 2017-07-09 09:44:07 +02:00
def 12286fe2f9 Add map_extract to distribution 2017-06-12 21:12:26 +02:00
heinrich5991 72f2eb32ee Fix wording in scripts/hash_passwords.py, fix brace in other file 2017-03-09 13:37:54 +01:00
heinrich5991 e707749fac Add a tool to hash new passwords or to update config files 
Usage:

```
$ python scripts/hash_passwords.py --new username admin password
auth_add_p username admin 9415aef5cc5043800377584cff32b90c 26fd308aad6b04f2
```

```
$ python scripts/hash_passwords.py autoexec.cfg
```
updates all instances of `auth_add` to `auth_add_p`.

```
$ python scripts/hash_passwords.py autoexec.cfg \
  --new user1 admin password1 \
  --new user2 admin password2
```
updates all instances of `auth_add` to `auth_add_p` and adds two new
users.

On Windows, you should be able to drag-and-drop your config file onto
this script and have it automatically updated (not tested).
 2017-03-09 12:48:06 +01:00
heinrich5991 cd3b0ae855 Implement the confusable algorithm from Unicode more closely 
See UTS#39 "Unicode Security Mechanisms":
http://www.unicode.org/reports/tr39/

This means that characters with accents or other things around them are
now considered the confusable with the base character.

Fixes #557. Fixes #575.
 2016-10-30 13:45:55 +01:00
H-M-H 9ca7651cb1 fixed path to look for SDL2 on OS X 2016-05-26 21:13:27 +02:00
def 9f08b68a01 Info.plist entry for High DPI on Mac 2016-05-07 16:41:46 +02:00
def 4de7b45ea6 Select SDL2.framework instead of SDL.framework on Mac OS X 2016-05-02 10:31:39 +02:00
def cc1f80471b Use same key limit as SDL2 does 2016-04-29 21:56:38 +02:00
def 5a42d90ee6 More SDL.dll -> SDL2.dll 2016-04-29 21:56:38 +02:00
def db8a126315 Merge swick's SDL2 branch 2016-04-29 21:55:48 +02:00
def ecca293cd0 Use tar.xz instead of tar.gz 2016-04-27 01:35:17 +02:00
def 975fbf3702 libwinpthread for new mingw 2015-09-03 11:50:40 +02:00
def d8a93ec084 Add config_store and config_retrieve to releases 2015-08-27 14:28:08 +02:00
def 15b69bdd9b Update def- -> ddnet 2015-08-17 02:25:37 +02:00
def aa1d5d3226 Ship autoexec_server.cfg 2015-08-12 14:29:13 +02:00
H-M-H 0086d19276 added Notifications for osx 2015-08-11 03:14:27 +02:00
def b6d5cf02b9 Use new master branch 2015-07-31 21:19:35 +02:00
def 6ae503353d Don't add announcement.txt and license_DDRace.txt to releases anymore 2015-07-22 23:06:45 +02:00
def 4b1b7adc4b Further license and cleanup 2015-07-22 22:49:20 +02:00
def e332a43dc5 Add libwinpthread-1.dll for Win64 2015-07-01 14:59:44 +02:00
def f711ba2ca3 Also fix 64bit Windows curl 2015-07-01 14:40:37 +02:00
def 9f0ad0fd33 Fix make_release.py for win64 2015-07-01 14:29:00 +02:00
def 224e1f5a8a Sigh, forgot another dll 2015-02-06 05:14:49 +01:00
def 8ecd66fc89 Fix windows build 2015-02-05 23:56:03 +01:00
fisted 095d172903 Link against libcurl. 
Conflicts:
	scripts/make_release.py
 2015-01-05 22:43:09 +02:00
def 006acade69 make_release.py for Windows with opus 2014-10-28 16:19:49 +01:00
def 2512005f6e Try adding the dilate binary 2014-05-09 01:17:46 +02:00
def 5f60491002 Minor fixes 2014-04-28 00:13:15 +02:00
def 3fc879728a Change example map to Kobra 2014-03-29 18:28:49 +01:00
def 6774a92029 Cleanup 2014-03-29 00:24:34 +01:00
def efa4f8b8d6 Cleanup of make_release.py by HMH 2014-03-29 00:08:35 +01:00
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
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