Commit graph

412 commits

Author SHA1 Message Date
Ravomavain 5b44fae0ce Remove unneeded variables 2011-09-02 12:05:14 +02:00
GreYFoX 5035506825 Fixed team collision and 0.6 trunk, 1.094a 2011-09-01 20:29:08 +02:00
GreYFoX d960765552 fixed warning: src/game/server/entities/laser.cpp:93: 'f' may be used uninitialized in this function 2011-09-01 02:14:05 +02:00
GreYFoX b7e3bbb824 added fix for #82 by BeaR 2011-08-31 23:36:41 +02:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +02:00
eeeee cfde5a20ec allow usage of eyeemotes in freeze 2011-08-31 02:36:47 +02:00
GreYFoX 4ca0681689 Added chat commands for only chat and available to all users
Thanks @heinrich5991 for this idea of a separate console object to handle it
2011-08-27 17:11:39 +02:00
eeeee 2d4c965c7e prevent excess draggers snapping to save loads of traffic 2011-08-27 14:09:06 +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 8877cf2293 Refactored some pointers 2011-08-02 12:35:14 +02:00
oy 7db6d1e056 fixed problem with player collision. Closes #722 2011-07-30 18:08:24 +02:00
GreYFoX 74462d4611 enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable 2011-07-25 22:16:20 +02:00
GreYFoX 344944c9d4 --b * 2 2011-07-22 16:23:03 +02:00
GreYFoX d965eb7453 utter noobness 2011-07-22 16:15:39 +02:00
GreYFoX cdbbf9e74b Removed a useless line
ps. commiting from the car while driving via iPhone xD
2011-07-22 16:02:56 +02:00
GreYFoX dd015c33c0 Fixing the sound for the laser when a player DCs after shooting it 2011-07-22 15:03:15 +02:00
GreYFoX 8f927a6033 Fixed a crash 2011-07-22 14:52:28 +02:00
GreYFoX 2964919bf2 Some logic fixes 2011-07-22 14:29:27 +02:00
GreYFoX b0420e66ee used Teams() instead of ((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams 2011-07-22 00:01:12 +02:00
GreYFoX 3d07ffdbdd Added the Missing Single Tee No Hitting Logic 2011-07-21 03:13:59 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile
Entities are in the previous commit
2011-07-19 23:33:12 +02:00
nsinreal 66a8000620 Fixed ninja: always set last active weapon after ninja's end 2011-06-27 16:28:49 +02:00
oy 957b81af07 made it possible to restrict player information in spectator mode 2011-06-19 11:28:39 +02:00
Choupom 558b110504 fixed #633 Correct sound effects in following spectactor mode 2011-06-11 18:33:30 +02:00
oy 2cc10fd6f0 fixed that the player keeps action when activating chat. Closes #719 2011-06-09 22:30:03 +02:00
Romain Labolle c17d3cdeda Reworking teams to allow pausing in team
* Adding wrappers functions to modify character or pause data if player are in game or paused.
* Moved OnFinish() function to teams.cpp so it can also be called on paused players.
* Pause is now enabled for team players.
* Adding bool CPlayer::IsPlaying() function that return true if the player is either in game or in pause. (false if spectator/dead).
2011-06-07 16:48:48 +02:00
GreYFoX c3df972fe3 Optimized checkpoint code 2011-06-05 13:56:04 +02:00
GreYFoX c1962bff25 Removed sv_broadcAst
this commit is funny cause it was made from my iPhone and it only took 8 minutes
2011-06-03 21:55:57 +02:00
Romain Labolle 38f1db1c4f Adding a checkpoint system for teleporters :
* Player go through a Checkpoint tile (29 in tele layer)
* He fall in a Check-Teleporter tile (31 in tele layer)
* Player is teleported to the check-TO (30 in tele layer) that have the same number as the last Checkpoint.
Thus players are teleported to the last checkpoint he passed, regardless of whether he made ​​the map in the right direction or not.

Tele tileset may need some improvement.
Closes Pull Request #52
2011-06-01 17:03:04 +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
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
GreYFoX 9e5336a13d fixed plasma snapping 2011-04-20 16:05:05 +02:00
GreYFoX 0584f2b7a2 Added Plasma Gun tweaking
made the default 3 plasmas per second more cpu friendly
2011-04-20 15:59:40 +02:00
GreYFoX 83318d0583 Refactored some stuff in CLight and fixed CLight::Snap 2011-04-19 15:34:59 +02:00
GreYFoX f5d38a84f9 formatting 2011-04-19 15:15:40 +02:00
GreYFoX 2fff744724 fixed laser snapping 2011-04-19 15:15:21 +02:00
GreYFoX 95408a8fd8 fixed a crash on toooooooo many draggers 2011-04-18 00:05:56 +02:00
GreYFoX 561ce64666 Renamed cheats to testing commands sv_test_cmds
Since these are testing commands, anyone can use them and only on their selves no login needed
Revised some rcon commands
cleanup some unwanted codes
2011-04-15 06:04:21 +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 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX 03095b5ecf Nothing 2011-04-12 00:27:52 +02:00
GreYFoX b2c67df7e7 fixed hammer hit 2011-04-10 15:07:36 +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 722644008f added a respawn delay command for tdm 2011-03-26 22:38:05 +01:00
GreYFoX 5b4d7a4658 Refactored + fixed sv_hit 0 + laser through others 2011-03-19 22:21:42 +02:00
GreYFoX c74cda68e0 Fixed tuned server behavior 2011-03-17 19:20:44 +02:00
GreYFoX 16c074741f To have Cheats you must set a password and sv_register 0
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 15:41:26 +02:00
GreYFoX cccfb09e32 Reverted Team to it's old state without leader or Strict until it's reworked 2011-03-16 15:14:25 +02:00
GreYFoX 2dc557d77b Fixed Rifle and Shotgun not affecting tees after Passing through owner when sv_old_laser = 1 2011-03-16 13:59:36 +02:00