Commit graph

3831 commits

Author SHA1 Message Date
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 c5d992dc2c nothing 2011-04-14 04:42:09 +02:00
GreYFoX 7c6d405e2a Fixed vote abortion by admin login 2011-04-14 04:26:13 +02:00
GreYFoX c37bad0be8 fixed a crash 2011-04-14 04:00:22 +02:00
GreYFoX 847aab9970 fixed banmaster compilation 2011-04-14 01:51:38 +02:00
GreYFoX 5668fa08ff fixed masterserver compilation 2011-04-14 01:51:26 +02:00
GreYFoX dc886b7b2e New emoticons eye actions 2011-04-14 01:36:51 +02:00
GreYFoX 2a0e272950 1.072a 2011-04-14 01:29:00 +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
GreYFoX f7892d3f00 Administrator privacy, re-enabled disabled functions 2011-04-14 00:53:33 +02:00
GreYFoX 61129aa15e avoided confusion between rcon kill and and local console kill 2011-04-14 00:51:29 +02:00
GreYFoX fd6388a9d8 Cheats are on unregistered servers only, added warning message about records not getting saved 2011-04-14 00:50:57 +02:00
heinrich5991 f0735554ec fixed the reworked IConsole::PrintResponse 2011-04-14 00:34:11 +02:00
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 2f99b4e324 forgot to add the music file 2011-04-13 21:08:34 +02:00
oy 43a6c02263 fixed the nethash 2011-04-13 20:48:50 +02:00
oy 1d426f1df9 fixed problem with ui_page 2011-04-13 20:45:16 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX 63e059b8ff Emoticons Enum has emoticons names instead of numbers 2011-04-13 20:31:16 +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 aeec62266b added Danish translation by SnOrKilll 2011-04-13 20:19:37 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +02:00
Choupom 2179ae0113 fixed need restart warning in settings 2011-04-13 17:49:31 +02:00
oy 876eac1048 added fix to make [Shift] only change the time of the point and not his value for envelopes in map editor by Choupon 2011-04-13 17:47:02 +02:00
oy 537e5fa7b6 added default keys for spectator next/previous and updated localisations 2011-04-13 17:39:26 +02:00
Johannes Loher 2e09bd6b9d Extended the control settings so spectate_next and spectate_previous can be set there. 2011-04-13 17:32:32 +02:00
GreYFoX 989d69a5b2 Mac make_release changes 2011-04-13 01:35:13 +02:00
GreYFoX dd70b687ed Better ICons + Mac Icons
Disabled Emotional tees until reworked
2011-04-13 01:34:39 +02:00
GreYFoX e3cc1c405e Merge branch 'master' of git://github.com/oy/teeworlds 2011-04-12 21:05:55 +02:00
oy ad5eeb14b3 added Norwegian translation by MertenNor 2011-04-12 20:35:28 +02:00
oy 62e816e847 fixed an entry within Russian translation 2011-04-12 20:31:47 +02:00
oy 0cfdd96b02 added flag for Bosnia and Herzegovina 2011-04-12 20:21:23 +02:00
Choupom ffe40db053 fixed map download speed and remaining time 2011-04-12 19:29:06 +02:00
oy b5070bac70 added update for Russian translation by RaZeR[RT] 2011-04-12 17:57:02 +02:00
oy 2a12516268 added update for Bosnian translation by *** 2011-04-12 17:53:42 +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 0ee65685be Fixed Crazy shotgun bullets 2011-04-12 00:28:00 +02:00
GreYFoX 03095b5ecf Nothing 2011-04-12 00:27:52 +02:00
GreYFoX 91a1a6f23b hmm 2011-04-11 17:14:24 +02:00
GreYFoX 25f229de38 the latest but not the last merge mistake 2011-04-11 16:54:43 +02:00
GreYFoX b4f05a6772 removed comments from voting - no longer needed 2011-04-10 15:32:56 +02:00
GreYFoX b2c67df7e7 fixed hammer hit 2011-04-10 15:07:36 +02:00
GreYFoX 75f8a95a75 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/version.h
2011-04-10 14:43:55 +02:00
oy 3788d2392d moved to trunk version again and added update for Portuguese translation by Slinack 2011-04-10 02:23:39 +02:00
Shereef Marzouk 0354625f9b fixed Mac compilation 2011-04-10 00:05:34 +02:00
GreYFoX 32a85dabe3 Fixed some merge mistakes, NOTE: This will be be buggy to say the least 2011-04-09 23:01:10 +02:00
GreYFoX aaac8a3f77 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/version.h
2011-04-09 22:33:06 +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 aecb97fa0a fixed problem with jungle_main 2011-04-09 21:15:25 +02:00
oy f677b397a3 made 0.6.0 release 2011-04-09 20:42:51 +02:00