Commit graph

3490 commits

Author SHA1 Message Date
Ravomavain e8229f537f Fix loading of old maps 2011-08-26 16:34:25 +02:00
Ravomavain 15d0a40825 Add user level access and use this level for /cmds if player is not authed. 2011-08-26 16:28:14 +02:00
Ravomavain 5912395554 Clarify this if statement. 2011-08-26 16:28:14 +02:00
Ravomavain 47a1e2b230 Fix banmaster compilation. Fix some sign-compare warnings 2011-08-26 16:28:13 +02:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
oy b1e7797b19 fixed compiling with mingw 2011-08-19 00:12:30 +02:00
oy 244d2bab3c fixed compiler setting. Closes #272 2011-08-19 00:10:58 +02:00
SushiTee 2ceb0fde91 fixed editor zooming if gui is not active 2011-08-16 23:15:51 +02:00
oy 2708256186 fixed quad selection via envelope preview 2011-08-16 21:35:00 +02:00
oy f36cc57bdd fixed last commit 2011-08-15 20:12:31 +02:00
Alexandre de5eccef3f Fix Stuffs & clean comments 2011-08-15 18:07:09 +02:00
Alexandre 367bb4b837 Map Editor: Envelope Preview 2011-08-15 18:07:05 +02:00
oy c38c632d06 fixed multiple popup creation in the editor. Closes #836 2011-08-13 19:22:01 +02:00
oy 4e830a71a1 decreased top offset of image add button in the editor. Closes #834 2011-08-13 18:53:41 +02:00
oy 7058726236 changed default UiPage to PAGE_INTERNET. Closes #839 2011-08-13 18:50:17 +02:00
oy 3fba3ee13e Merge pull request #832 from GreYFoX/oypull1
Cleanup
2011-08-13 09:20:40 -07:00
GreYFoX 06afe36db4 Removed old hook through prediction as 0.5.2 servers are no longer compatible
made it possible to load old maps
Enumerated layers
2011-08-13 02:12:40 +02:00
GreYFoX 5b27758650 Removed level stuff
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
2011-08-13 02:11:06 +02: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
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
Shereef Marzouk 2084febca7 Removed outdated comment 2011-08-11 10:43:27 +02:00
oy c56cfa12d5 Merge pull request #827 from arionwt1997/patch-5
Russian translation fixes
2011-08-08 11:02:49 -07:00
arionwt1997 1ba57a5696 Edited by Arion WT 07.08.2011, Fixed some errors 2011-08-07 13:16:28 +03:00
Kottalizer 379e5c7378 added matiasmunk's improvements 2011-08-06 22:49:11 +02:00
oy 5fc5b63dac just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer 2011-08-06 22:30:18 +02:00
oy de05682d87 fixed play hooking when tune player_collision is 0. Closes #825 2011-08-06 13:57:59 +02:00
oy 003c0aa281 fixed aspect ratio in the editor's image preview. Closes #784 2011-08-06 13:08:29 +02:00
oy f1ea039df7 added separator in image menu. Closes #785 2011-08-05 19:52:39 +02:00
oy 2b2ddde04f sort players in kick/move to spec vote and player options by team. Closes #809 2011-08-05 19:52:38 +02:00
oy e5395f00b3 fixed that activating a quad point doesn't align it on the grid and made moving the pivot use the grid. Closes#792 2011-08-05 19:52:37 +02:00
oy fee2c2c452 fixed an overlapping in the editor. Closes #794 2011-08-05 19:52:36 +02:00
oy b7605dd0b5 reset quad point selection when activating a different quad. Closes #819 2011-08-05 19:52:34 +02:00
oy 72eb98c75e changed to trunk again 2011-08-05 19:52:33 +02:00
oy 709c05bb37 improved description for restart command. Closes #796 2011-08-05 19:52:32 +02:00
oy 2aee50d5b1 fixed a nasty noise problem. Closes #812 2011-08-05 18:37:59 +02:00
oy dfd9e142d5 Merge pull request #801 from fisted/fix_srs
here is clevar solution for serious design flaw
2011-08-03 13:54:48 -07:00
oy 435639636e Merge pull request #808 from SushiTee/master
fixed a warning
2011-08-03 13:53:18 -07:00
oy 558f62f810 Merge pull request #813 from GreYFoX/oypull
Minor and not important changes, but useful
2011-08-03 13:50:48 -07:00
Shereef Marzouk 8877cf2293 Refactored some pointers 2011-08-02 12:35:14 +02:00
Shereef Marzouk 2b5c532589 converted white spaces to tabs 2011-08-02 12:14:49 +02:00
Shereef Marzouk c1b23535ff fixed typo 2011-08-02 12:14:23 +02:00
Shereef Marzouk 29de27f9dd Used the enum const TILESLAYERFLAG_GAME instead of 1 2011-08-02 12:14:00 +02:00
SushiTee 83652c91ec fixed a warning in client (mac) 2011-08-01 21:03:51 +02:00
SushiTee 370b93d8e1 fixed a warning 2011-08-01 12:11:10 +02:00
oy 50edfd37c0 made 0.6.1 release 2011-07-31 23:17:00 +02:00
oy b25fc26c1c zero out client memory on startup to prevent more bad surprises 2011-07-31 18:39:48 +02:00
oy 9cf4facd05 fixed a client crash in debug. Closes #806 2011-07-31 17:07:10 +02:00
oy 3209aec45f fixed compiling error on osx 2011-07-31 13:17:38 +02:00
oy 9418802150 protected econ authentication against brute force 2011-07-31 13:05:12 +02:00
oy 1705c90e14 fixed ban for life on the server 2011-07-31 12:43:35 +02:00