Commit graph

801 commits

Author SHA1 Message Date
Choupom 7b87cfa68a made envelopes synchronized with other clients 2011-05-03 18:12:32 +02:00
heinrich5991 9fb36fd802 added strict game type filter 2011-05-02 19:25:38 +02:00
Romain Labolle f4ca6d9ad5 Some Clean up: closes #28
* m_VoteEnforcer variable is never used.
* pController variable is not used in OnMessage scoop.
* CNetObj_ClientInfo have now only 4 m_Name ints, so change it to 4 in ghost.cpp
2011-04-20 18:07:38 +02:00
GreYFoX d0ed9612e1 Properly done cl_show_entities 2011-04-19 16:32:42 +02:00
GreYFoX 00ef75390f Laying off some caps 2011-04-17 20:02:32 +02:00
GreYFoX dad66bffc3 General DDRace binds improvements 2011-04-17 19:45:48 +02:00
oy 246cbed786 colorized background of entries in the server browser scoreboard so it's more obvious what belongs together 2011-04-16 18:55:36 +02:00
oy 726bbbbdb0 added missing localisation in the demo player 2011-04-16 18:37:57 +02:00
GreYFoX c6ca0fd6b0 Fixed Reset Filter 2011-04-15 06:40:42 +02:00
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 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
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +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 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 e3cc1c405e Merge branch 'master' of git://github.com/oy/teeworlds 2011-04-12 21:05:55 +02:00
Choupom ffe40db053 fixed map download speed and remaining time 2011-04-12 19:29:06 +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 caf1a9f912 made translations ready for 0.6 release and added fixed friends/mute icons 2011-04-09 18:08:11 +02:00
oy c902d98be3 moved vote tabs on top 2011-04-09 00:03:56 +02:00
oy 9643fc36ae added new hammer hit effect by SushiTee and Crises 2011-04-08 19:11:41 +02:00
oy b5510d4cf9 fixed possible client crash with extra projectiles on disconnect 2011-04-08 11:22:44 +02:00
oy b985fdc20a added new friend/mute buttons by Crises and reworked the player options like Landil suggested. Closes #579 2011-04-06 20:18:31 +02:00
oy ebca792975 improved call vote tab. Closes #573 2011-04-06 11:41:40 +02:00
oy 9b97eb282a prevent that you can add votes with an empty description 2011-04-05 20:06:41 +02:00
oy 2401cc2ec3 highlight the followed player in scoreboard and show their score on top 2011-04-05 19:00:00 +02:00
oy 5c6e274a88 added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566 2011-04-04 20:37:12 +02:00
Johannes Loher 622b3de9bd Added more convenient variabe names for sectate_next and spectator_previous 2011-04-04 17:29:32 +02:00
Johannes Loher 1364631211 Added functionality to switch to the next and the previous player while spectating. 2011-04-04 17:29:08 +02:00
oy c20a33ede7 added more space for translations in demo details. Closes #592 2011-04-03 23:33:43 +02:00
Choupom 733f0b3390 reimplemented extra projectiles 2011-04-03 22:57:03 +02:00
SushiTee b6f607e73b little more space between killmessages so the tees dont overlap 2011-04-02 22:24:57 +02:00
oy 401543c7a9 added some space for colour channel translations in the graphic settings as well 2011-04-02 19:34:02 +02:00
Choupom b3cb33eec0 replace team name by clan name if possible 2011-04-02 18:11:43 +02:00
SushiTee 4adad07ad8 polished scoreboard a bit 2011-04-02 15:18:52 +02:00
SushiTee 0db6022c64 centering scoreboard (goals and spectators) correctly 2011-04-02 15:18:45 +02:00
oy 2c9b454fb8 added some more space for the translations of the colour channels 2011-04-02 12:13:23 +02:00
oy 30c45b7899 removed newline from a localisation. Closes #572 2011-04-02 12:08:46 +02:00
oy 37b75f90e4 fixed that unsaved map notice in quit popup overlaps 2011-04-02 12:01:10 +02:00
oy 593a8ee6ec improved settings menu. Closes #564 2011-04-01 19:36:44 +02:00
oy a6fced3d3a made new version notification show up in red colour 2011-04-01 18:06:59 +02:00
oy 9a4426779d decreased the font size for some menu buttons and tabs to give translations more room 2011-04-01 17:57:04 +02:00
oy cd9176331d auto add .demo if not present when renaming a demo 2011-03-31 18:33:46 +02:00
oy 0e6aca2b28 fixed a missing translation 2011-03-31 18:24:02 +02:00
oy 08c03104b4 changed ingame vote menu so it fits the other tabs and it's makes localisations easier 2011-03-31 15:43:12 +02:00
oy 9712e4004c improved the add/remove friend and ignore/notice chat buttons 2011-03-29 00:48:36 +02:00
oy 0307138950 added better headlines for tabs in vote menu 2011-03-28 23:51:46 +02:00
oy 141089f257 fixed more compiler warnings 2011-03-28 23:30:56 +02:00
oy 867f944459 added graphic buttons for remove/add friend and chat ignore/notice 2011-03-28 21:10:37 +02:00
oy 63d2019b19 fixed that chat overlaps the spectator hud 2011-03-27 23:43:45 +02:00
oy 7bd79f9f43 added remove_favorite command by Choupom 2011-03-27 18:05:11 +02:00
GreYFoX 85fa86102f Refactored e to Event 2011-03-27 17:21:30 +02:00
GreYFoX eb344c83ce Chat History. Closes #521 2011-03-27 17:21:07 +02:00
oy 4d5443affa added demo loading speed enhancement by MAP94. Closes #555 2011-03-27 16:42:47 +02:00
oy 2aa1bda97e made mouse wheel change speed in demo player. Closes #524 2011-03-27 16:26:50 +02:00
oy 67b026f65f added an option to disable ingame HUD. Closes #523 2011-03-27 14:40:15 +02:00
oy edf10b8b13 added an option to disable team colors for name plates. Closes #544 2011-03-27 14:30:59 +02:00
oy 5b328e5484 added a limit for the number of votes that can be added to the server and send options as lists when a client joins. Closes #459 2011-03-26 22:06:29 +01:00
oy 6e1b6b102a added menu to add/remove a vote on the server 2011-03-26 18:43:43 +01:00
oy fbeace5272 cleaned up some voting code 2011-03-26 17:44:34 +01:00
oy b8f144ba81 added a vote that allows to move a player to spectators. Closes #58 2011-03-26 16:56:59 +01:00
oy 6ece07ee74 added force_vote command 2011-03-25 12:06:45 +01:00
oy 359b806e95 added remove_vote command. Closes #47 2011-03-25 11:49:35 +01:00
oy a4580d451f added reasons to vote in general and show reason in vote hud. Closes #219 2011-03-25 10:26:59 +01:00
oy 8ad3def65e added aliases for votes. Closes #144 2011-03-25 09:49:21 +01:00
oy d78c84b105 removed local player from kick vote menu 2011-03-25 09:27:46 +01:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
oy b64db75a6b added an option to ignore other players in chat 2011-03-22 22:41:27 +01:00
Sebastian Wojtowicz 55ce870597 Client utf8 converting (servernames,playernames) in Internet tab and (playernames,playermessage) in chat and hud 2011-03-22 21:11:10 +02:00
oy 05244d4dad decreased the size of the "reset to defaults"-button in the settings menu 2011-03-22 00:40:43 +01:00
oy 2beae20208 don't use highlight chat sound for server messages 2011-03-22 00:34:07 +01:00
oy eaef2ce48a added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115 2011-03-22 00:31:42 +01:00
oy 18e5412358 added sound for highlighted chat message. Closes #508 2011-03-20 15:58:59 +01:00
oy 96808a1145 made it possible to just show the number of player slots of a server (instead of client ones). Closes #68 2011-03-20 15:33:49 +01:00
oy 3d63afacc2 fixed a problem with the country flag selector, changed a localisation and the format of a file 2011-03-19 19:31:00 +01:00
oy da8c0c61b5 made scoreboard show clan name and country flag and fixed overlapping spectator names. Closes #203. Closes #335 2011-03-19 18:28:47 +01:00
oy 079de7bc10 fixed that the server browser shows matching map name 2011-03-18 19:14:35 +01:00
oy a8bf857c68 improved server browser list resorting and made search work on IP addresses. Closes #482 2011-03-18 19:03:13 +01:00
oy a3c9ec889f fixed problem with the text colour when using the spectator menu 2011-03-18 18:03:50 +01:00
oy f8ae9f7732 made server browser show clan name and country code for players 2011-03-18 17:59:48 +01:00
GreYFoX 0d0f72b059 stopped spamming the console 2011-03-18 02:10:48 +02:00
GreYFoX b7d5014d3c fixed a little mistake 2011-03-18 01:36:03 +02:00
GreYFoX 974f429957 Added git revision to several places 2011-03-18 01:21:07 +02:00
oy 0313485d6b fixed that PageMenu buttons change their inactive colour ingame 2011-03-17 17:48:45 +01:00
GreYFoX 8c2ef1f1ea version 1.063a
some default binds
2011-03-17 03:50:07 +02:00
oy b4bec53359 added clan name and country flag selector to the player settings 2011-03-16 21:31:55 +01:00
GreYFoX 87cde802b1 Added a new entities_clear
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
2011-03-16 19:48:16 +02:00
GreYFoX 3bae74f21d Added Ability to predict old hook through tiles from DDMax
fixed a warning
2011-03-16 17:36:54 +02:00
GreYFoX 0cbcdd027a Removed Helper made Moderators able to moderate only
Enumerated levels
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 16:27:30 +02:00
GreYFoX ee178d5a48 Client Cheat showing entities in game 2011-03-16 14:48:16 +02:00
oy 156e23b592 added loading/support for country flags to the client 2011-03-16 12:09:22 +01:00
oy 7b91ebd01c show actual page and fixed overlapping in the console 2011-03-15 09:15:46 +01:00
oy 09dc08859d added a function to set the text outline colour and increased readability of nameplates on bright backgrounds. Closes #205 2011-03-13 12:55:00 +01:00
oy 01ea32f816 removed unused stuff from CMenus::RenderServerInfo 2011-03-13 11:14:35 +01:00
oy be8f669333 added extended demo infos in the demo browser 2011-03-13 10:41:10 +01:00
oy a04eb45354 added rename button to the demo browser and updated localisation entries 2011-03-12 19:08:44 +01:00
oy 5c723f5d2f added info about the actual recorded demo length in the notification box 2011-03-12 18:34:16 +01:00
oy b834426548 fixed several problems with spectator view in game and demo player. Closes #83 2011-03-12 18:07:57 +01:00
oy 7b98b3dded fixed camera in spectator mode 2011-03-10 17:57:15 +01:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
oy 4bede550be only update the ping if the scoreboard is active. Closes #27 2011-03-01 18:31:20 +01:00
oy 0bc13c91eb made cl_threadsoundloading work again 2011-02-27 17:56:03 +01:00
oy d9ce720387 made engine an interface 2011-02-27 15:03:57 +01:00
GreYFoX 90d93ba7b2 Client showothers 2011-02-23 22:22:05 +02:00
GreYFoX 0e5ef2e4f4 Fixed show ids
Fixed missing letter
2011-02-23 18:12:34 +02:00
GreYFoX 5ffe4e9429 Added In-Game Page DDRace 2011-02-23 09:33:21 +02:00
GreYFoX 5571ec70fa More Settings in the Settings tab 2011-02-23 08:36:14 +02:00
oy 088ec3e2f3 made the client's map search work with sub folders. Closes #254 2011-02-21 11:23:30 +01:00
GreYFoXGTi 7455ebfee9 I had a crash here, dunno why! 2011-02-17 11:24:11 +02:00
GreYFoXGTi d9bb3d652c fixed cl_ddrace_scoreboard 2011-02-16 19:11:24 +02:00
GreYFoXGTi 793ea4a499 Don't holdup spawning if tees are there
fixed cl_ddrace_scoreboard
2011-02-16 19:04:41 +02:00
GreYFoXGTi 6e3818c779 Don't Reset Controls 2011-02-16 12:59:30 +02:00
oy 927954a53b added new emoticons. Closes #362 2011-02-16 11:45:19 +01:00
GreYFoXGTi 78ee6148f8 SortHash
Loading String
2011-02-16 12:22:55 +02:00
GreYFoXGTi 6904956a14 Added some DDRace Menu Items
Enforced cl_ddrace_cheats on zoom
2011-02-16 11:20:27 +02:00
noother 901859a494 fixed all known bugs in racedemos & ghosts, including "ghost is shown when playing a demo", "ghost doesn't reset when crossing the startline
again" (this conflicts with racemod however, where the time isn't reset on crossing the start tiles again. This should be removed in
DDRace.), "ghost sometimes doesn't save"  (this was because of kill tiles right next to finish tiles, and it just wasn't quick enough when
going through them fast), "demos contain a lot of garbage before the actual run (prior attempts)" ghosts and racedemos should now work 100%
2011-02-16 10:39:26 +02:00
GreYFoXGTi 335a8f69c2 Morning Cleanup 2011-02-16 10:21:23 +02:00
GreYFoXGTi 2fd0ff1b85 Added Show IDs
and altered last commit
2011-02-15 03:14:32 +02:00
XXLTomate f0201597c6 DDRace Settings-tab
Checkbox for DDRace Scoreboard
2011-02-15 02:36:22 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy 09cd38d320 cleaned up skin initialisation 2011-02-13 13:58:59 +01:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi 21816e5bbf Checked and updated Ghost and Autorecord from Racemod updates, by Redix and Sushi Tee
Old Ghosts are no longer compatible
2011-02-11 08:01:10 +02:00
oy c2ad73cfe8 fixed negative download speed. Closes #473 2011-02-10 12:38:20 +01:00
oy 0c119ba99b fixed possible problem with localisations if the linereader flushes its memory between reading the origin and the replacement string 2011-02-10 12:07:00 +01:00
GreYFoXGTi 4ca79188dc DDRace Flags Finalized 2011-02-05 06:13:32 +02:00
GreYFoXGTi 24a688b2c3 Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother 2011-02-04 22:15:02 +02:00
GreYFoXGTi 984d10970e Localization and Cooler Browser Filter 2011-01-31 00:30:53 +02:00
GreYFoXGTi 9d98ce7e72 Version 1.03a 2011-01-30 23:51:14 +02:00
GreYFoXGTi 0aa3e8f546 Forgot to do this with the other DDRace Flags 2011-01-30 21:11:32 +02:00
GreYFoXGTi f1b002e7fa DDRace flags for the server browser (client-sided).
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
2011-01-30 18:21:41 +02:00
GreYFoXGTi e16bd4d000 Mac Compilation
This may appear un-important, but it's important for mac compilation!
2011-01-29 02:53:33 +02:00
heinrich5991 dc8ec160e5 removed the usage of std::string in scoreboard 2011-01-26 20:54:19 +01:00
SushiTee c0b905f852 -fixed compiler warnings
-fixed mac compiling
2011-01-26 14:45:44 +02:00
GreYFoXGTi f1a8b6b7ad Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
2011-01-24 14:06:55 +02:00
oy fa2cd82335 clamp maximum ping value in the server browser filters 2011-01-23 18:04:31 +01:00
oy 3727deee43 increased mouse scroll value from 1 to 3 in the other listboxes too 2011-01-23 17:54:19 +01:00
Carmine 0c43e6f906 increase scroll value in the server list broswer, from 1 to 3 2011-01-23 17:53:58 +01:00
GreYFoXGTi 109cbd4e28 The DDRace scoreboard is now for all Race types 2011-01-21 10:07:32 +02:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
2011-01-20 16:10:32 +02:00
oy da84771345 removed some old checks 2011-01-18 18:53:19 +01:00
oy 0b14286c7f skip spectators in dm hud 2011-01-18 17:56:09 +01:00
oy 3b3ca9cd67 rearranged the goals within the scoreboard a bit 2011-01-17 16:31:24 +01:00
oy 02db5bfe66 decreased the height of the scoreboard a bit. Closes #417 2011-01-17 13:55:14 +01:00
oy 99c6b87c1a hide broadcast when motd is active. Closes #420 2011-01-17 13:46:59 +01:00
oy 813f0797d8 fixed scoreboard active check. Closes #423 2011-01-17 13:42:40 +01:00
oy bf6fcc20f4 added an error popup on startup when the sound couldn't be initialised. Closes #425 2011-01-17 13:28:15 +01:00
oy 216967c3bf release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +01:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
2011-01-12 11:08:17 +02:00
oy b94c70d351 close the scoreboard when opening the menu in the demo player. Closes #407 2011-01-12 01:33:16 +01:00
oy 3f4556a861 hide the broadcast when the scoreboard is active. Closes #408 2011-01-12 01:18:07 +01:00
oy 1f55237919 made the end game message in team games a bit smaller so it doesn't overlap the scoreboard. Closes #406 2011-01-12 01:10:40 +01:00
oy d79fd3d4c0 added dm score hud. Closes #356 2011-01-12 01:01:05 +01:00
oy b60d6deb51 made m_paInfoByScore within gameclient's snap state work and cleaned up render scoreboard 2011-01-11 23:03:01 +01:00
oy 8f999837c6 improved the count down timer. Closes #391 2011-01-10 00:58:03 +01:00
oy 9819163c5f fixed some overlapping in the server browser. Closes #376 2011-01-10 00:18:30 +01:00
GreYFoXGTi 959b05d557 Merge branch 'master' of http://github.com/oy/teeworlds 2011-01-10 00:45:58 +02:00
oy 9358b24113 reset demo player on end and when pressing the stop button. Closes #401 2011-01-09 23:42:37 +01:00
oy 91f642fac2 fixed cut off broadcast. Closes #398 2011-01-09 23:25:07 +01:00
oy eedaf62d97 fixed that the client crashes if it has no skins 2011-01-06 22:55:57 +01:00
GreYFoXGTi 6889adc0bb Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	.gitignore
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
oy 418dd8eccc added fix by CarmineZ for missing option in the control settings. Closes #395 2011-01-06 13:17:54 +01:00
GreYFoXGTi 82eac5cf3b ScoreBoard now is different for DDRace only 2011-01-06 06:45:53 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 1d9190fd5b Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/russian.txt
	readme.txt
	src/game/variables.h
2011-01-06 01:49:58 +02:00
oy 13902fef6c show an error popup when demo deletion fails 2011-01-05 22:22:07 +01:00
oy 18461535fd changed time left localisation in the map download popup to allow better translations 2011-01-05 17:28:53 +01:00
oy 2992d9a6c6 scale control settings as well 2011-01-05 12:19:06 +01:00
Damian Kaczmarek 073044747b -Working ui_scale parameter.
(doing it properly would require lots of framework/interface job ...)
2011-01-05 12:14:36 +01:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
2011-01-04 22:37:09 +02:00
oy 67f86e3547 added option to change nameplates size by RushPL 2011-01-04 13:11:01 +01:00
oy bcba9e5c89 moved HslToRgb stuff 2011-01-04 11:58:25 +01:00
oy 336f00ae89 added colours for tile layers by Choupom 2011-01-04 11:38:14 +01:00
Choupom 533d28e35a made team colors for nameplates (fixes #207) 2011-01-03 12:54:58 +01:00
oy a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +01:00
Yoyo117 d9c71f49f3 minor improvement 2011-01-02 19:58:06 +01:00
GreYFoXGTi e803f30f52 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/flag.cpp
	src/game/server/player.cpp
	src/game/variables.h
2010-12-16 06:06:23 +02:00
oy ec09fbf23b let the chat lines disappear gradually. Closes #342 2010-12-16 04:20:50 +01:00
oy 54f138f894 made broadcast text a bit smaller and cut it off if it's bigger than the screen. Closes #313 2010-12-16 03:17:16 +01:00
GreYFoXGTi 3956c34b6d Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
2010-12-16 04:15:05 +02:00
oy 6063b4c14d added auto completion of nicknames and highlighted nicknames in chat. Closes #218 2010-12-16 02:31:12 +01:00
oy 1d7df01e9a added map download progress by kaddyd 2010-12-16 01:52:29 +01:00
GreYFoXGTi 2f5f332cbb Merge branch 'master' into DDRace
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
2010-12-13 03:43:22 +02:00
oy c0530b0d09 added language popup on first start. Closes #336 2010-12-12 19:20:30 +01:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
GreYFoXGTi 46c2225d60 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
	scripts/make_release.py
	src/engine/shared/config_variables.h
2010-12-11 21:28:43 +02:00
oy a0985314c9 made it possible to "recycle" auto recorded demos 2010-12-11 18:55:28 +01:00
GreYFoXGTi 4510ced422 Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace 2010-12-10 21:20:34 +02:00
GreYFoXGTi 2c51511260 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
2010-12-10 20:58:53 +02:00
oy 4756c031c5 save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu 2010-12-08 01:55:13 +01:00
oy db9dd6b8c9 added an optional time stamp to a demo record by Batchyx 2010-12-08 00:42:32 +01:00
oy 665934ee09 cleaned up several uses of timestamps for filenames 2010-12-08 00:32:50 +01:00
oy bd9850cae2 added single function to stop recording by Batchyx 2010-12-08 00:02:24 +01:00
oy 39b531452a fixed colour of the particles when a tee dies. Closes #331 2010-12-07 23:54:25 +01:00
oy 7414271309 check the return values of RemoveFile and CreateFolder 2010-12-07 23:47:41 +01:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
GreYFoXGTi 45fa3d49b5 Revert "Client won't vote on comments by Sushi Tee" caused crashes
This reverts commit ed7a1d5bcd.
2010-12-06 03:32:44 +02:00
GreYFoXGTi ed7a1d5bcd Client won't vote on comments by Sushi Tee 2010-12-06 00:28:35 +02:00
GreYFoXGTi c149b17617 FinishTime Difference 2010-11-30 05:04:21 +02:00
GreYFoXGTi af44a79b03 New Broadcast/Timer System 2010-11-30 04:24:15 +02:00
GreYFoXGTi 461abbaa7e Fixed Scoreboard cl_show_ids 2010-11-29 04:46:45 +02:00
GreYFoXGTi ae4aebd365 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-24 02:28:01 +02:00
oy e6698b1118 apply custom colour to blood colour. Closes #314 2010-11-24 01:11:56 +01:00
oy bc5f3fc839 fixed client crash when there are lots of particles. Closes #105 2010-11-24 01:08:51 +01:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
oy 8e3cba8dbf disable free view when chatting as spectator. Closes #303 2010-11-21 18:05:26 +01:00
oy ba05ddd0f5 removed duplicate entry from the localisation files 2010-11-21 14:12:39 +01:00
oy e4f1e18c4e fixed entry names in the demo browser and the editor's file dialog. Closes #301 2010-11-21 12:33:13 +01:00
oy f75ad090e9 fixed a localisation string 2010-11-20 23:46:49 +01:00
oy 7a6006087c removed duplicate note in password popup 2010-11-20 23:39:17 +01:00
Choupom 0aa0a56990 fixed so ui_scale is affected on server's name (fixes #43) 2010-11-20 21:37:35 +01:00
Choupom 38c2a1b45c fixed so every demo infos are not loaded when making the demos list 2010-11-20 21:34:13 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi a764ebc1a8 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-20 11:00:41 +02:00
oy 32e52d51ce added a missing localisation 2010-11-19 20:20:51 +01:00
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
2010-11-18 01:10:59 +02:00
oy d94355729d added icons in the demo browser and the editor's file dialog. Closes #209 2010-11-17 19:46:50 +01:00
oy 8351682edf added constants for console types by Choupom 2010-11-17 13:01:46 +01:00
oy f1ce0d1949 improved loading progression in the server browser 2010-11-17 12:43:24 +01:00
Choupom a7f37446b6 added loading progression in server browser 2010-11-17 12:31:44 +01:00
GreYFoXGTi ae591407c9 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-17 13:11:40 +02:00
oy 9ff7500f30 fixed graphic problems with ninja when pausing a demo. Closes #269 2010-11-17 00:38:20 +01:00
btd 081c5d8bc2 Fix score board and small perfomance improvments 2010-11-05 14:56:44 +03:00
btd 418875b5e5 Add score board time, need to add in server send time for players if someone enter 2010-11-04 19:39:04 +03:00
btd 62ef58329d Return DDRace stuff. No need in mistic compatibility 2010-10-31 23:50:40 +03:00
GreYFoXGTi fc433afd49 Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-31 20:32:35 +02:00
oy 6c51e864ee deactivated emote selector in spectator mode. Closes #250 2010-10-31 19:15:20 +01:00
GreYFoXGTi 85df8a047d Fixed btd's last commit and ensured RaceClient Support(tested) 2010-10-30 21:44:46 +02:00
btd 86365bedcd Add Race stuff but fully reworked. Still only need to make score board 2010-10-30 18:22:35 +04:00
GreYFoXGTi fb88a8e4e7 Added In-Game Server Browser. Closes #65.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-30 00:44:52 +02:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
GreYFoXGTi 4d204d642f Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/console.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
2010-10-26 00:25:36 +02:00
oy 1209ad9baf fixed a problem with the skin selector 2010-10-25 21:23:05 +02:00
GreYFoXGTi 2f3152691c Revert "ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b" because it's buggy and i never intended to pull it, but btd did
This reverts commit 5b5eb0b2c0.
2010-10-25 20:09:08 +02:00
Choupom d2519f7ab9 small ui fixes 2010-10-25 18:59:33 +02:00
heinrich5991 5b5eb0b2c0 ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b 2010-10-22 17:29:46 +02:00
GreYFoXGTi 4197a6ce8b Re-enabled pure tuning check, reset tunings to vanilla values, made server apply DDRace tunings on startup and map change. Closes #97.
Revert "Now can Join Vanilla servers. Closes #96."

This reverts commit c6fda43369.

Conflicts:

	src/game/client/components/menus_settings.cpp
2010-10-22 15:22:17 +02:00
GreYFoXGTi 43eb6025a1 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-20 15:12:37 +02:00
heinrich5991 5df496317b fixed line endings to LF 2010-10-20 08:13:48 +02:00
GreYFoXGTi abafbdd919 Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-20 01:19:06 +02:00
SushiTee 314cda05c7 changed demo animations according to demo speed and added some demo speeds. (fixes #206) 2010-10-19 18:52:16 +02:00
GreYFoXGTi 5ac519f742 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-19 18:31:24 +02:00
GreYFoXGTi c6fda43369 Now can Join Vanilla servers. Closes #96. 2010-10-19 18:30:45 +02:00
heinrich5991 684e1788ed added strict gametype filtering 2010-10-19 17:18:32 +02:00
btd 1f0e49c080 Add my old zoom staff 2010-10-17 12:43:27 +04:00
GreYFoXGTi 7f437f7245 Merge branch 'master' of http://github.com/heinrich5991/DDRace
Conflicts:
	src/game/server/gamecontext.cpp
2010-10-16 22:02:34 +02:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
2010-10-16 21:59:59 +02:00
oy 662f43919c fixed overlapping restart warning 2010-10-16 11:27:49 +02:00
oy 639c32d661 do not show the restart warning in the settings if you change back to actual settings. Closes #90 2010-10-16 11:24:42 +02:00
oy 5f7efb465e optimised console rendering a bit 2010-10-16 10:32:56 +02:00
oy 764ee3fd17 optimised chat rendering a bit 2010-10-15 19:26:20 +02:00
heinrich5991 9cf90fff77 added config for showing client ids in scoreboard 2010-10-13 22:47:28 +02:00
oy fa768449e2 fixed issue with reason on forcevotekick 2010-10-13 20:31:21 +02:00
GreYFoXGTi 47714c9468 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/variables.h
2010-10-13 14:08:35 +02:00
oy 5801326ebc fixed line endings 2010-10-13 12:59:30 +02:00
oy e4fe7457c8 fixed problems with the mouse movement. Closes #214 2010-10-13 12:47:42 +02:00
oy e4b3c468f2 don't show voting hud when playing a demo and added missing localisations. Closes #88 2010-10-13 01:19:22 +02:00
GreYFoXGTi 921dd65d3d Added id numbers to the scoreboard. Closes #71.
added shortcuts to the gitignore
2010-10-12 15:12:44 +02:00
GreYFoXGTi e46dd6b5e6 Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-11 19:45:14 +02:00
oy eb4a56edeb tweaked auto scrolling in the chat window a bit 2010-10-11 12:31:45 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
2010-10-11 03:56:58 +02:00
oy 411db8b885 fixed that chat message gets out of the window. Closes #102 2010-10-11 02:29:30 +02:00
oy de7504282c made edit boxes scrollable. Closes #96 2010-10-11 01:36:46 +02:00
oy b65a26fe93 fixed last commits 2010-10-11 01:06:44 +02:00
Choupom 61201fea13 added reason to kick a player in the callvote tab 2010-10-11 00:31:21 +02:00
oy 5754812dea clear history of the remote console on disconnect and cleaned up some old stuff in console.cpp 2010-10-11 00:30:56 +02:00
Choupom 00c1421034 fixed so the rcon password is not in the history (fixes #170) 2010-10-11 00:18:04 +02:00
oy 107545da0a localised "REC"-notification 2010-10-11 00:16:37 +02:00
GreYFoXGTi 40d2068c70 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/player.cpp
	src/game/variables.h
2010-10-10 14:36:02 +02:00
oy 85b9c60158 added info in the demo browser by Choupom 2010-10-09 13:27:21 +02:00
GreYFoXGTi 6ca75f086e Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-08 13:37:38 +02:00
oy a075889312 fixed a listing problem in the demo browser 2010-10-08 00:13:05 +02:00
GreYFoXGTi faaa8c241e Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-07 15:33:48 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
GreYFoXGTi 56c4655e55 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-01 19:33:39 +02:00
GreYFoXGTi 8a5d1100a5 This reverts commit b4b2404303.
thanks to Speedy-Consoles for pointing out the commit

Closes #54.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-01 19:25:54 +02:00
SushiTee 1f5849f6dc fixed last digit in current time 2010-10-01 04:03:08 +02:00
SushiTee 8824d41011 race time wasnt in center 2010-10-01 04:03:07 +02:00
GreYFoXGTi b6a17d1e47 Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-09-30 23:38:27 +02:00
GreYFoXGTi 896634a061 Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
oy 2f388139c1 fixed auto-scrolling in server browser and listbox 2010-09-30 01:13:12 +02:00
oy 68851630ca fixed server browser list. Closes #74 2010-09-30 00:32:45 +02:00
oy aaf8e2bc8e cleaned up demo listing and fixed its sorting. Closes #73 2010-09-29 00:53:53 +02:00
GreYFoXGTi 526e36f8a0 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/client/components/menus.h
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/variables.h
2010-09-27 06:32:14 +03:00
GreYFoXGTi ac36e562a5 Made Personal Best/Vanilla Score Updated on game enter 2010-09-27 00:31:33 +03:00
SushiTee 5faec7c80d changed pickup animation speed for demos according to demospeed (fixes issue 72) 2010-09-26 18:00:29 +02:00
oy 7e0b37e06c fixed that it checks the current dir for demos too 2010-09-24 13:38:03 +02:00
Choupom 1cbf731fc0 improved demos listing 2010-09-24 13:22:40 +02:00
oy 27425facff fixed last commit 2010-09-24 13:21:03 +02:00
Choupom aa46c22e10 now put skins in an array to save memory 2010-09-24 13:13:46 +02:00
GreYFoXGTi e56b75090c Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/player.cpp
2010-09-22 11:46:18 +03:00
oy 5156579d1d fixed sound bug when using in the editor. Closes #136 2010-09-22 00:51:32 +02:00
GreYFoXGTi 67a5765c9f Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/components/camera.cpp
	src/game/client/components/camera.h
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_layer_tiles.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 21:27:40 +03:00
oy cf2d46d3ba increased deadzone when seeking through the file in the demo player 2010-09-19 16:36:10 +02:00