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

2287 commits

Author SHA1 Message Date
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
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 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 435639636e Merge pull request #808 from SushiTee/master 
fixed a warning
 2011-08-03 13:53:18 -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 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
oy 50edfd37c0 made 0.6.1 release 2011-07-31 23:17:00 +02:00
oy 10c3e844d7 show alpha2 country code strings next to the flag in the country code selectors. Closes #805 2011-07-31 02:04:46 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy 7db6d1e056 fixed problem with player collision. Closes #722 2011-07-30 18:08:24 +02:00
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00
oy 65d312fd06 fixed problem with lineinput. Closes #802 2011-07-28 22:01:14 +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 831aea796e Saving hitting status on pause 2011-07-25 21:15:51 +02:00
Choupom b7aa8af7aa thats why magic values sux 2011-07-23 18:42:51 +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 d7fe844690 1.082a 2011-07-22 14:33:07 +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
oy 6312a2d71c fixed few things in th editor 2011-07-20 22:18:31 +02:00
Choupom 84e5c53432 added color envelope feature for tilemaps 2011-07-20 22:04:13 +02:00
Choupom c2e8bf5035 made a constant for game layer flag 2011-07-20 21:54:23 +02:00
Choupom 188e622373 fixed auto_map.h header guard 2011-07-20 21:54:19 +02:00
GreYFoX 959b11b13d Admin protection closes #59 2011-07-20 03:18:03 +02:00
GreYFoX a6922db418 1.081a 2011-07-19 23:33:46 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile 
Entities are in the previous commit
 2011-07-19 23:33:12 +02:00
SushiTee f7a9e80163 added possibility to collapse groups by double clicking them 2011-07-15 01:03:22 +02:00
SushiTee ef881a5321 added layer/image scrolling via mouse wheel 2011-07-15 01:02:11 +02:00
SushiTee d78c0d66e5 ability to name groups and layers 2011-07-15 00:47:52 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
oy 5f4a5b3366 added country flags to language selectors 2011-07-12 20:33:53 +02:00
SushiTee 6cd2ab3887 added grid to editor 2011-07-11 12:03:16 +02:00
oy f4ce34f01c close spectator/emoticon menu when changing to team/spectator via bind. Closes #768 2011-07-11 12:02:45 +02:00
Romain Labolle a6dc6f34b6 Display a message when an admin forces a vote. Closes #759 2011-07-11 11:28:04 +02:00
oy 7bc07b613f added auto mapping feature by LordSkelethom 2011-07-09 01:09:06 +02:00
oy e18390fea8 fixed that client resets tuning. Closes #746 2011-07-05 23:32:32 +02:00
oy 20fbe2f92c fixed that player friends are marked as online in the friends list if they match a clan friend 2011-07-05 23:23:33 +02:00
oy ac9c3b8f7f made the dropped flag sign blink faster the last 5 seconds to indicate that it's about to return. Closes #631 2011-07-05 23:15:24 +02:00
oy ab1f7d6f95 clamped information flow when moving as spectator in free-view. Closes #551 2011-07-05 22:58:54 +02:00
oy b153003b0b fixed dm wincheck 2011-07-04 18:30:24 +02:00
oy 7648ba3024 added a different mouse sens for menus/editor 2011-07-03 00:36:07 +02:00
Choupom 4a5c13d1de fixed so Reset Filter button resets all filters 2011-07-02 19:23:36 +02:00
Johannes Loher 3f583d44f9 fixed so there can't be a negative time being displayed when timelimit runs out while there is warmup. If warmup is active, the time will be displayed as if there was no timelimit. 2011-07-01 18:34:28 +02:00
oy 123eab41c8 made it possible to filter by player country in the server browser. Closes #654 2011-06-29 22:27:32 +02:00
oy 8035e022fd fixed cursor positioning by mouse in edit boxes 2011-06-29 18:39:58 +02:00
oy fdf6db5fd6 fixed that music resets on password prompt. Closes #695 2011-06-27 23:26:01 +02:00
oy 47cdd2524b do not try to play sound when it isn't enabled 2011-06-27 22:57:06 +02:00
oy e8938e3d80 set the minimum of seconds remaining in map downloading popup to 1 2011-06-27 22:35:23 +02:00
oy 08b6ffd52c fixed possible server stressing 2011-06-27 17:20:46 +02:00
Johannes Loher f80c46e24d fixed so you can use whatever time you want on set_team and so that it uses minutes 2011-06-27 17:07:51 +02:00
Johannes Loher 14f98a9ded Added possibility to deny changing of team after a set_team for a certain amount of time. Added server setting to do this automatically for spec votes. fixes #640. 2011-06-27 17:07:23 +02:00
Choupom bf6ca3e33d fixed tiles infos in groups with custom para or offset in editor 2011-06-27 16:50:38 +02:00
oy 1239150846 fixed password popup UI issue. Closes #583 2011-06-27 16:39:23 +02:00
nsinreal 66a8000620 Fixed ninja: always set last active weapon after ninja's end 2011-06-27 16:28:49 +02:00
oy fb309436b4 improved friends feature 2011-06-26 17:10:13 +02:00
oy c10c7d9ac3 improved sudden death in ctf. Closes #617 2011-06-19 17:32:00 +02:00
oy 957b81af07 made it possible to restrict player information in spectator mode 2011-06-19 11:28:39 +02:00
oy 4dc79a9ec1 fixed spawn bug. Closes #634 2011-06-15 01:03:14 +02:00
Choupom c1ebda73e3 fixed #687 Bug with the ctf score when the round starts, fixed so you can't grab the flag if the game is over 2011-06-11 18:34:05 +02:00
Choupom 558b110504 fixed #633 Correct sound effects in following spectactor mode 2011-06-11 18:33:30 +02:00
oy eae1a97297 fixed marker position in chat 2011-06-09 23:54:11 +02:00
oy fd965ca4b2 made name highlighting in chat more strict 2011-06-09 23:49:06 +02:00
oy 37bdc4c2a1 removed some unneeded stuff 2011-06-09 23:40:35 +02:00
oy 4f402f85bb added ':' after names on start and a space separator in chat tab completion 2011-06-09 23:37:59 +02:00
oy e1ef01f656 made tab completion for names in chat start with the ones that match on the beginning 2011-06-09 23:28:20 +02:00
oy 9845d757ef removed file extension from the demo name in the demo player 2011-06-09 22:44:22 +02:00
oy 348806d993 abort "move to spectator"-vote when the player disconnects 2011-06-09 22:31:55 +02:00
oy 2cc10fd6f0 fixed that the player keeps action when activating chat. Closes #719 2011-06-09 22:30:03 +02:00
GreYFoX 9c4b1c9892 fixed a crash, closes #56 2011-06-07 17:21:47 +02:00
GreYFoX 457fee998d Refactored a variable 2011-06-07 17:05:19 +02:00
GreYFoX e6189d05c4 On name change relaod scores, fixes %55 2011-06-07 17:05:07 +02:00
GreYFoX 1bfcfb7d6f Changed max of force pause to be 360 seconds 
Note if force pause was abused once infront of me i would make even admins have to go through a vote
 2011-06-07 16:55:06 +02:00
Romain Labolle 3f2dc36151 Fixing Force-pause: 
* sv_vote_pause_time : maximum 15s, default 10s
* Removing sv_vote_pause_auto (so afk stay in pause)
* force_pause require config level
* force_unpause set force-pause timer to 0
 2011-06-07 16:49:36 +02:00
Romain Labolle bb971bdcf0 Adding vote to force-pause players (instead of just moving them to spectators). 
* Add the following config variables :
  * sv_vote_pause: Allow voting to pause players (instead of moving to spectators) (default: 1)
  * sv_vote_pause_time: The time (in seconds) players have to wait in pause when paused by vote (default: 60)
  * sv_vote_pause_auto: Automatically unpaused players after the force-pause delay or not (default: 0)
* Add the following functions :
  * force_pause v?i : Force v to pause for i seconds
  * force_unpause v : Force v to unpause
 2011-06-07 16:48:49 +02:00
Romain Labolle 0ae0b0bb83 Adding pause specific message when players use /pause (instead of joined the game/spectators). 2011-06-07 16:48:48 +02:00