Commit graph

359 commits

Author SHA1 Message Date
Choupom deff0ce7c4 fixed netevent struct names 2011-06-02 17:40:08 +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 63e059b8ff Emoticons Enum has emoticons names instead of numbers 2011-04-13 20:31:16 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +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 05889f3e3e fixed problem with the hammer hit particle 2011-04-09 00:02:08 +02:00
oy 9643fc36ae added new hammer hit effect by SushiTee and Crises 2011-04-08 19:11:41 +02:00
oy e63683e649 added new friends/mute icons and buttons by Crises 2011-04-08 18:45:57 +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 867f944459 added graphic buttons for remove/add friend and chat ignore/notice 2011-03-28 21:10:37 +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 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 18e5412358 added sound for highlighted chat message. Closes #508 2011-03-20 15:58:59 +01:00
oy 30d9c9f4d9 made network support clan name and country code for players 2011-03-15 11:23:49 +01:00
oy 1f10c1e8bf fixed problem with ctf if there're no flags 2011-03-10 10:14:41 +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 927954a53b added new emoticons. Closes #362 2011-02-16 11:45:19 +01:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi 3da1860654 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
2011-02-04 18:54:54 +02:00
oy 9c6843946c added Python 2.5 - Python 3.2 support by Sworddragon 2011-01-29 18:55:21 +01:00
oy 3c1eee2a12 reverted Python 3 support fixes to keep compatibility with 2.5 2011-01-20 01:28:17 +01:00
oy 232aafa891 added Python 3 support fixes by Sworddragon 2011-01-17 15:48: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 e71263d686 fixed last commit 2011-01-06 12:41:24 +01:00
Sworddragon 4ff61fcdaa Made compiling process Python 3 compatible 2011-01-06 12:27:50 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02: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 a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +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
btd 62ef58329d Return DDRace stuff. No need in mistic compatibility 2010-10-31 23:50:40 +03:00
GreYFoXGTi 85df8a047d Fixed btd's last commit and ensured RaceClient Support(tested) 2010-10-30 21:44:46 +02:00
GreYFoXGTi 8d88f5d541 Partially Revert "Refactoring" to keep DDRace compatible with SushiTee's Stuff
This partially reverts commit 505a5b4172.
2010-10-30 20:17:59 +02:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
btd a62decbc91 Show others for ddrace clients.
Need to fix entities now.

Signed-off-by: btd <bardadymchik@gmail.com>
2010-10-24 14:47:25 +04:00
btd 61092f7baa Begin show_others
Signed-off-by: btd <bardadymchik@gmail.com>
2010-10-23 23:26:10 +04:00
GreYFoXGTi c24964ebcd Added tele, speedup, front and switch layer to the client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:36:08 +02:00
GreYFoXGTi 896634a061 Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
btd da36e27b57 Every time i forgot this 2010-09-12 00:57:30 +04:00
GreYFoXGTi 616498e7b1 Merge branch 'master' of http://github.com/oy/teeworlds into master
Conflicts:
	src/engine/client/input.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/network_server.cpp
	src/engine/storage.h
	src/game/client/components/chat.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/collision.cpp
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:57:38 +02:00
Fujnky 4123f28bba Improved demo player another bit.
* Replaced the reset button by more common stop button
* Made the demo player automatically reset after demo ended
2010-09-04 16:23:20 +02:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-25 17:31:49 +02:00
GreYFoXGTi f6f7699ef1 btd Fixed compiling
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-24 14:46:44 +02: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 7503c64237 made unpacking of net strings more strict - prevents possible malformed output 2010-08-12 15:22:07 +02:00
oy 822b002344 fixed the ninja tip cut off and made its weapon and pickup sprite equal. Closes #127 2010-06-23 20:09:15 +02:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 97eb28afae reduced item respawn delay from 20 to 15 seconds again 2009-01-24 10:40:11 +00:00
Magnus Auvinen 123c5b5b99 introduced 3 special pseudo weapons. game, self and world to make a difference on how you got killed 2009-01-12 21:41:16 +00:00
Magnus Auvinen 46125d5ed7 fixed so predicted sounds and air jump effect works with demo playback 2009-01-11 15:51:43 +00:00
Magnus Auvinen c2c90982fd increased the firedelay on the gun and hammer to 125ms. this is how fast a humanly doable. prevents usage of mouse wheel to get insane firing speeds 2009-01-11 13:54:42 +00:00
Magnus Auvinen b70eb4263f fixed unpure sprite 2009-01-11 13:42:01 +00:00
Alfred Eriksson 39a12060d6 removed the tuning filtering and warning. modded servers can use tuning for free. added pure server checking - ctf, dm and tdm gametypes are not allowed to have different tuning. 2009-01-11 10:40:14 +00:00
Magnus Auvinen 5e3f740220 improved the error reporting of the network unpacker 2008-12-19 11:25:14 +00:00
Alfred Eriksson 8dd58e48c3 fixed ninja effect 2008-11-16 11:13:21 +00:00
Magnus Auvinen 388a04d957 better voting support 2008-11-08 12:50:46 +00:00
Alfred Eriksson 1e961fdece fixed pickup sounds 2008-10-21 17:14:18 +00:00
Magnus Auvinen f4d60ffff8 some small python changes 2008-10-19 16:50:57 +00:00
Magnus Auvinen c995aff8e3 fixed input state mask, missed one bit that could make the server hang itself 2008-10-18 20:50:42 +00:00
Magnus Auvinen 9d1c56e2fd adjusted the sv_killmsg to account for death tiles 2008-10-18 18:02:51 +00:00
Magnus Auvinen 35bcd41aa2 added hammer hit effect. added reset of all systems on state change. solves a lot of possible memory errors 2008-10-17 11:23:21 +00:00
Magnus Auvinen 3544db4927 fixed #490 (insert the player info in the sv_setinfo message into the snapshot instead) 2008-10-08 20:47:56 +00:00
Dominik Geyer faa96f6d3a show if servers use non-standard tuning and let serverbrowser filter for these; ticket #393 2008-10-05 09:57:46 +00:00
Dominik Geyer 397b9a764b data-dir autodetection; data-dir override; compiled-in data-dir; messagebox if detection fails; does chdir into data-dir 2008-10-01 17:16:22 +00:00
Magnus Auvinen eac9658b73 added voting gui and a lot of other minor changes 2008-09-29 11:34:49 +00:00
Magnus Auvinen aaaba4f403 continued on the voting 2008-09-25 12:23:44 +00:00
Magnus Auvinen 917ebc17c6 begun the work on voting 2008-09-24 14:47:03 +00:00
Magnus Auvinen d9d37b945e some server restructure. added hook no attach sound 2008-09-23 18:08:19 +00:00
Magnus Auvinen 33b50738e6 added dead reckoning to the characters 2008-09-23 07:43:41 +00:00
Magnus Auvinen afeb3adc5d small foot animation fix 2008-09-21 19:00:40 +00:00
Alfred Eriksson 6a4e17ea85 added round number to the scoreboard 2008-09-07 15:07:08 +00:00
Magnus Auvinen 4fb71c1bca fixed order of pickup ids 2008-09-04 21:54:21 +00:00
Magnus Auvinen 53da3f0d40 added favorites. no saving of them yet however 2008-09-03 20:03:01 +00:00
Magnus Auvinen 67aa042dcb compile fixes for windows 2008-09-01 17:30:20 +00:00
Magnus Auvinen 0a48454a55 removed the GAMETYPE_ enum 2008-08-31 14:37:35 +00:00
Magnus Auvinen b322643f17 missed some files 2008-08-27 15:51:09 +00:00
Magnus Auvinen 16912026db added cl_layershot. fixed some bugs in the network 2008-08-17 07:05:16 +00:00
Magnus Auvinen a13b94f9e0 minor update 2008-07-08 09:07:21 +00:00
Magnus Auvinen 3705064b10 renamed .h to .hpp in game because they are c++ headers 2008-06-12 12:09:34 +00:00
Magnus Auvinen f6c67c29cd large commit with loads of clean up. more is comming 2008-06-12 10:51:48 +00:00
Magnus Auvinen ac18c6a3bd more stuff :) 2008-04-27 05:59:38 +00:00
Magnus Auvinen bc108df382 renamed everything. added the new license 2008-03-22 18:40:27 +00:00
Magnus Auvinen ffa7735e0d added compatible version filter. cleaned up the server browser a bit. increased rifle ammo to 10 2008-03-22 14:26:17 +00:00
Magnus Auvinen ef1b57a655 added new rifle gfx 2008-03-21 19:54:52 +00:00
Magnus Auvinen 48d4aa0e89 added the rifle to the maps and removed it from the starting inventory 2008-03-21 19:05:35 +00:00
Magnus Auvinen 5afd6b21b5 fixed ninja spawn time 2008-03-17 01:46:37 +00:00
Magnus Auvinen ad19e0702e tweaked the rifle and added rifle sounds 2008-03-17 01:03:14 +00:00
Magnus Auvinen 4a3c2e2c8c loads of fixes, skidding, velocity ramping and other stuff 2008-03-16 22:32:17 +00:00
Magnus Auvinen e7241d743c fixed the ninja rendering 2008-03-10 19:36:05 +00:00
Magnus Auvinen 4739966e14 larger restructure to improve security 2008-02-24 16:03:58 +00:00
Magnus Auvinen acffe66ebe flashified the console 2008-02-10 01:48:39 +00:00
Magnus Auvinen da2d792186 renamed laser to rifle. 2008-02-04 07:59:25 +00:00
Magnus Auvinen 5f32f5b36f added laser weapon 2008-02-02 18:05:16 +00:00
Magnus Auvinen 7bc733dc10 large update. cleaned up some code. added new effects for almost everything 2008-01-29 21:39:41 +00:00
Magnus Auvinen 84be08f29c fixed error in teewars.ds 2008-01-19 16:47:09 +00:00
Magnus Auvinen bf2ddd701a some missed files 2008-01-19 16:44:11 +00:00
Magnus Auvinen 906ece7894 continued the cleanup 2008-01-12 17:09:00 +00:00
Joel de Vahl 4fd640c705 new experimental weapon 2007-12-27 17:46:32 +00:00
Magnus Auvinen 85d58973e8 changed the balance of the shotgun a bit.. firedelay 400->500, more spread, slower speed and even speed on the pellets 2007-12-16 22:46:23 +00:00
Magnus Auvinen 87cf8cc5ac added new ctf sounds 2007-12-15 15:35:50 +00:00
Magnus Auvinen c4915c5bd9 added airjump sound. added the option to choose sound device 2007-12-15 14:30:22 +00:00
Magnus Auvinen 1ba4e8d4ef some renames and sniper stuff 2007-12-15 12:04:48 +00:00
Joel de Vahl 349fcdb7f8 Initial code for winter background 2007-12-09 18:19:42 +00:00
Magnus Auvinen 6336124097 generall update with alot off small stuff 2007-12-09 13:36:54 +00:00
Magnus Auvinen 8fa8485a3a fixed CTF sounds. fixed close teewars bug 2007-11-27 19:32:35 +00:00
Magnus Auvinen dda8f6b33e fixed skin selector and some other mindor stuff 2007-11-18 12:03:59 +00:00
Magnus Auvinen 7efefe2716 many smaller changes. changed how projectiles are handled. fixed joining bug 2007-11-11 21:02:36 +00:00
Magnus Auvinen adb9240bc3 removed some old images 2007-11-08 20:07:24 +00:00
Magnus Auvinen 711aa0db76 update, gui stuff, some engine stuff 2007-11-08 09:11:32 +00:00
Magnus Auvinen daf89a01ff added skins, tweaked prediction like hell 2007-11-04 00:19:41 +00:00
Olle Rosenquist eba83b7e19 Sniper 2007-10-14 13:54:02 +00:00
Magnus Auvinen b73dcec397 added mousewheel support. added next/prev weapon support 2007-10-04 22:37:35 +00:00
Magnus Auvinen a67738e980 general fixes. fixed scoreboard 2007-10-03 21:32:02 +00:00
Magnus Auvinen c919da6640 made stuff for ctf. all editor stuff for it is done. the ctf logic has to be written. 2007-08-30 07:15:26 +00:00
Magnus Auvinen 0e7054a24a made a switch for gametype 2007-08-25 08:54:14 +00:00
Magnus Auvinen 0320d20a47 fixed network hash versioning 2007-08-22 21:13:33 +00:00
Jakob Fries 3a8af93e33 emoticons version 1 2007-08-14 22:48:49 +00:00
Magnus Auvinen 2cde04ddce merged over all stuff from 0.2 to trunk 2007-08-14 18:37:16 +00:00
Joel de Vahl 3856db4b8b Merged in lost hand changeset. 2007-08-14 15:03:59 +00:00
Jakob Fries 42d519e893 reverted bogus commit 2007-08-14 13:23:18 +00:00
Jakob Fries f8884ded02 hands. 2007-08-14 13:20:33 +00:00
Jakob Fries bf3efbc586 sounds are now WavPack instead of Wav 2007-08-09 14:55:11 +00:00
Jakob Fries d5e3c556bf emotes 2007-08-09 00:18:11 +00:00
Magnus Auvinen c6f7bd9547 added the new chat sounds 2007-08-05 14:28:42 +00:00
Magnus Auvinen 421300ffb8 many small changes everywhere 2007-08-05 08:59:38 +00:00
Magnus Auvinen 9572927f35 fixed gfx glitch with the character 2007-08-04 23:25:19 +00:00
Magnus Auvinen fc2c1286a6 various gameplay tweaks 2007-08-04 19:00:06 +00:00
Jakob Fries c89e2d0dc8 changed plonk sound 2007-08-04 17:38:42 +00:00
Jakob Fries ee2ff62378 hit ding sound now in 2007-08-04 17:28:31 +00:00
Jakob Fries 9f35dfa5db added switch and noammo sounds. ingame chat works more intuitively (sp?) 2007-08-04 16:49:57 +00:00
Jakob Fries 7bf877d252 balance fixes 2007-08-04 01:53:26 +00:00
Magnus Auvinen 7703137618 added pickup sounds for the weapons 2007-08-03 06:35:35 +00:00
Magnus Auvinen 565c998c8a added build dirs 2007-08-02 08:45:06 +00:00
Magnus Auvinen f826bc6cac larger update. reduced the amount of video memory used from ~60 to ~36mb on a typical map 2007-07-30 19:46:31 +00:00
Magnus Auvinen 2cb87d92ba added pickup sounds for health and armor. added sounds for weapon respawn 2007-07-29 16:44:30 +00:00
Joel de Vahl 30a027a0da Chat bubble. 2007-07-26 11:33:49 +00:00
Jakob Fries f946cc6f5f most gui things are now loaded by data compiler thingie. ingame menu now looks better. 2007-07-26 11:18:14 +00:00
Magnus Auvinen 5bd2c434f6 epic commit. removed tga support, removed BGR support. fixed one config for editor, server and client, optimized tilemap rendering (this needs some cleanup), added tools to fix alpha outline quirk and glitches in the tilemap reindering 2007-07-24 22:53:43 +00:00
Olle Rosenquist 8714046db0 Ninja powerup shouldn't spawn directly 2007-07-23 17:50:55 +00:00
Olle Rosenquist d81b11e0da Ninja updates 2007-07-22 14:20:00 +00:00
Joel de Vahl 48ed41b105 Hammer hit sound. 2007-07-22 14:16:57 +00:00
Olle Rosenquist 2aa61ada11 Shotgun firedelay tweak 2007-07-22 12:41:30 +00:00
Magnus Auvinen 4a2f1d3beb small updates 2007-07-22 12:27:49 +00:00
Magnus Auvinen 2231cd8c39 various small changes 2007-07-22 12:01:20 +00:00
Olle Rosenquist bcb97cfdf6 Data update 2007-07-22 12:01:04 +00:00
Olle Rosenquist 5f39523f41 Compile fix 2007-07-21 21:47:10 +00:00
Olle Rosenquist b6c9c311c5 Updated stuff 2007-07-21 21:17:30 +00:00
Olle Rosenquist 15f4eda123 Updated stuff 2007-07-21 19:25:10 +00:00
Magnus Auvinen 9e4aea97bd lots of cool new features :D new master server 2007-07-21 18:07:27 +00:00
Jakob Fries 60b252c584 2007-07-14 23:08:17 +00:00
Magnus Auvinen 568b9f1f4a added chat, better damage indicators 2007-07-14 13:09:42 +00:00
Magnus Auvinen 125d04e51f large rewrite and code cleanup 2007-07-13 13:40:04 +00:00