Commit graph

20729 commits

Author SHA1 Message Date
GreYFoXGTi 01cc3f4d68 Merge branch 'master' of http://github.com/oy/teeworlds
and fixed Conflicts:
	src/engine/server/register.h
	src/game/server/gamemodes/mod.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-15 20:46:02 +03:00
unknown a91d7cfd1f Merge branch 'master' of http://github.com/btd/DDRace 2010-08-15 18:47:13 +03:00
btd 3fa19ee608 Merge 2010-08-15 19:21:18 +04:00
btd bbd48810ad Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 19:20:39 +04:00
GreYFoXGTi 185db5fb72 Just a test commit of the FrontLayer
i only commited this cause i am not at home and i wanna work on this externally :D

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-15 17:42:40 +03:00
oy 02c7e3642a clear active motd message when the game is over 2010-08-15 15:48:56 +02:00
oy 94b28c8c97 fixed quit/exit command problem on startup 2010-08-15 15:41:04 +02:00
oy 0e36b772d4 fixed line endings in some files 2010-08-15 15:34:55 +02:00
btd e458f02dfe Fix NoLaser Tile. Crazy shotguns work 2010-08-15 16:28:34 +04:00
btd 1a559c5d03 More checks in timer 2010-08-14 15:36:12 +04:00
btd 512597f729 Add crazy shotguns. Need to test 2010-08-14 14:46:54 +04:00
btd 619f7cb268 Small fix 2010-08-14 13:45:19 +04:00
btd dfa60a65d2 Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace-Server 2010-08-14 13:40:40 +04:00
Fujnky 4d8c4ffadb Improved the replay control buttons in the demo player a lot.
* Now there is a combined play/pause button + a reset button
* Replaced the ugly strings with nice graphics
2010-08-13 03:17:13 +02:00
oy d01fb2eb78 added missing information in debug mode. Closes #77 2010-08-13 03:07:51 +02:00
btd a8a74f558a Trigger and door now work 2010-08-12 22:07:35 +04:00
oy 5a237c6f78 fixed utf8 problem with empty entries in the server browser 2010-08-12 19:29:59 +02:00
GreYFoXGTi c9ac55f2cd Merge branch 'master' of http://github.com/btd/DDRace 2010-08-12 20:08:20 +03:00
oy d9a3cc032f updated refactor script and fixed a thing 2010-08-12 19:03:03 +02:00
GreYFoXGTi 9d30803854 code optimization
added stoppers

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-12 17:31:38 +03:00
oy 54f804eda2 fixed bug in servers setclientname 2010-08-12 16:12:25 +02:00
GreYFoXGTi 3a36be3f58 forgot to edit these
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-12 16:54:43 +03:00
oy f494d344a9 removed some not longer needed stuff 2010-08-12 15:44:11 +02:00
oy 7503c64237 made unpacking of net strings more strict - prevents possible malformed output 2010-08-12 15:22:07 +02:00
GreYFoXGTi 122fcef8b6 Updated gitignore 2010-08-12 15:15:58 +03:00
GreYFoXGTi 465272651d New Layout 2010-08-12 14:30:46 +03:00
GreYFoXGTi 09b7a1fe1d Fixed the laser problems
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-12 14:15:58 +03:00
btd 3f2363b27e Fix errors. Server can be builded. Study using editor =( 2010-08-11 22:29:08 +04:00
btd 2cf2a5b1d2 Add Door, connector and trigger. Not tested i need work.
Signed-off-by: btd <bardadymchik@gmail.com>
2010-08-11 14:33:37 +04:00
oy 1cde96ef79 restore empty strings in the config to their defaults on startup 2010-08-11 00:31:42 +02:00
GreYFoXGTi afa93fb203 draft of the current entities not ready waiting on Fisico to come online xD
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-10 19:33:52 +03:00
GreYFoXGTi 20930ce68b too many stuff to write but the idea is to implement the telelayer&speed thnx to Redix and Sushi Tee
also FrontLayer is ready to be implemented soon

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-10 19:32:32 +03:00
oy d37c83962d fixed weapon change on start bug 2010-08-10 13:54:13 +02:00
oy 9753f62d46 added tool tip for value selector button in the editor 2010-08-10 13:47:33 +02:00
GreYFoXGTi 60b5acbb15 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/engine/shared/storage.cpp
	src/game/server/gamecontext.cpp
Alterations:
	src/engine/shared/console.h  | made StoreCommands(,)take also the client id
	src/engine/console.h  | made StoreCommands(,)take also the client id

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-09 17:54:42 +03:00
oy 3797eba179 added demo recording button by fujnky 2010-08-09 14:14:15 +02:00
oy d471663913 added localisation fixes by fujnky 2010-08-09 00:35:37 +02:00
SushiTee 866f76727b using PROPTYPE_INT_SCROLL for layer size in editor 2010-08-08 23:46:23 +02:00
SushiTee 981b47d0af updated freetype 2010-08-08 19:22:25 +02:00
oy 6a73c5d77f fixed flickering players on respawn 2010-08-08 18:56:54 +02:00
oy 4322113435 fixed overlapping skin name in the player settings 2010-08-07 20:52:33 +02:00
btd 227c03cbb1 Fix mistake 2010-08-07 22:49:57 +04:00
oy 0a66e0586d fixed a small bug in the ban command 2010-08-07 20:31:36 +02:00
oy ad9b32b741 added the possibility to store commands within the console and execute them later on when everything is initialised correctly - fixes several possible startup crashes and the "Support bans in server configuration"-ticket 2010-08-07 20:22:25 +02:00
btd e416c38ad1 GreYFoX fix of ban 2010-08-07 21:16:48 +04:00
btd 84cf23203d Revert storage.h 2010-08-07 12:02:58 +04:00
oy 3f0ff1fb14 removed ServerDummy function cause it isn't needed anymore(actual console separates client and server commands) and added two missing server commands to the tab completion 2010-08-07 00:01:43 +02:00
oy cac5554bdb prevent that spectators start a vote 2010-08-06 21:03:38 +02:00
oy 3c082b6441 changed the client configuration initialisation 2010-08-06 20:47:45 +02:00
oy 49cefa406b added lost logfile feature 2010-08-06 20:38:13 +02:00