Commit graph

1249 commits

Author SHA1 Message Date
xalduin ab0d8d0eb8 Merge remote branch 'upstream/master'
* upstream/master:
  fixed bug with the quick search box. Closes #89
2010-06-04 12:01:37 -04:00
oy 3d079a35e9 fixed bug with the quick search box. Closes #89 2010-06-03 23:32:32 +02:00
xalduin 9603d676c6 Score no longer decreased when switching teams 2010-06-03 17:08:05 -04:00
Fujnky 82a30b7b7e Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 22:42:10 +02:00
Fujnky 4ffab2af80 Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 22:33:38 +02:00
xalduin a563c2f322 Issue #82 time and date in screenshot filename 2010-06-03 22:32:42 +02:00
xalduin 277eeef098 Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 16:24:41 -04:00
xalduin 3dc9beb7ec Issue #82 time and date in screenshot filename 2010-06-03 16:24:31 -04:00
oy 67d4903b9f fixed stuck "error loading demo"-popup. Closes #90 2010-06-03 22:03:27 +02:00
xalduin 8b15558f5d Merge remote branch 'upstream/master 2010-06-03 13:32:15 -04:00
Fujnky 5849aeb86c Merge branch 'master' of git://github.com/matricks/teeworlds
Conflicts:
	src/game/server/gamemodes/ctf.cpp
2010-06-03 17:47:32 +02:00
Fujnky 551170656d Fixed localization for 'Error loading demo'-Popup 2010-06-03 17:41:45 +02:00
Magnus Auvinen a6ab379e67 fixed so that the same distance is used when leaving off the flag and taking it 2010-06-03 17:40:01 +02:00
Magnus Auvinen 9bb6fe48c2 cleaned up g_CharPhysSize 2010-06-03 17:39:42 +02:00
Fujnky 5a641132e7 Fixed localization for 'Error loading demo'-Popup 2010-06-03 17:07:15 +02:00
Fujnky feb8894b4d Flag catch and capture should now be exactly the same 2010-06-03 16:42:37 +02:00
xalduin 3fff61d24a Issue #86, don't reset score on team switch 2010-06-03 10:35:18 -04:00
xalduin 6baadea5e1 Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 09:59:06 -04:00
xalduin 8db32a4b8b Issue #88 flag pickup distance reduced 2010-06-03 09:56:57 -04:00
Fujnky 00c53adffb Merge branch 'master' of http://github.com/SushiTee/teeworlds-stuff 2010-06-03 15:43:52 +02:00
xalduin 6491dfc16c Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 09:36:24 -04:00
Fujnky 7b74cd248b made flag catch and capture distances fit 2010-06-03 15:30:33 +02:00
SushiTee 0115161463 mergend stuff 2010-06-03 15:21:12 +02:00
oy 5988b9d388 - show connecting players with rcon status command
- make it possible to limit the number of clients with the same ip that can connect to the server
2010-06-03 14:48:32 +02:00
Fujnky d581e413c8 More localization fixes 2010-06-03 11:30:05 +02:00
xalduin de1a7acfaa Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 00:37:46 -04:00
Fujnky 7cbf0f93ca Some localization fixes 2010-06-02 23:15:56 +02:00
Fujnky 64ddee0a21 Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-02 21:47:47 +02:00
SushiTee c37335b115 shortened IsAuthed a bit 2010-06-02 21:33:19 +02:00
NoxNebula dd19074deb Admin-Kick-Protection
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
2010-06-03 03:27:34 +08:00
xalduin cc181cda5b Merge remote branch 'upstream/master' 2010-06-02 15:21:31 -04:00
Fujnky 0d4c0ccef5 Some localization fixes 2010-06-02 21:03:15 +02:00
oy ad1ce01446 fixed shotbug (#80) 2010-06-03 02:57:46 +08:00
oy 7a1953e60b added fix for editor quad editing by ghost91 Closes #18 2010-06-02 20:50:48 +02:00
oy b2a55766d1 fixed shotbug (#80) 2010-06-02 19:39:28 +02:00
xalduin 9e6c909624 Removed unnecessary SortImages call in RenderImages 2010-06-02 13:26:17 -04:00
xalduin a99cbfc742 Image sorting working, less hackish 2010-06-02 12:12:32 -04:00
NoxNebula 9a5a19e7c7 Admin-Kick-Protection
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
2010-06-02 09:40:08 +02:00
xalduin 8e1712c744 Sort by map name when opening map
When opening a map, the list of map names is now sorted alphabetically.
2010-06-02 06:39:05 +08:00
xalduin f2920ea5d8 Sort by map name when opening map
When opening a map, the list of map names is now sorted alphabetically.
2010-06-02 05:11:12 +08:00
Magnus Auvinen b851bc8799 fixed so that SDL_main is declared as a C function so linking gets done correctly 2010-06-02 04:09:39 +08:00
Magnus Auvinen b12ae69fee fixed compile errors for osx 2010-06-02 04:00:05 +08:00
Magnus Auvinen 61fdee3367 fixed so that SDL_main is declared as a C function so linking gets done correctly 2010-06-01 21:59:04 +02:00
Magnus Auvinen f8d69b2fe6 fixed compile errors for osx 2010-06-01 21:55:08 +02:00
Tom Adams 54692ceaf1 added fix for editor->append by xalduin 2010-05-31 21:55:45 +00:00
Tom Adams f14e7369f1 fixed movement bug (#741) 2010-05-31 21:40:40 +00:00
Tom Adams 30987c2040 removed alpha values from screenshots (#742) 2010-05-31 20:44:45 +00:00
Tom Adams c9ff80a17d made balance teams based apun points/minute (#495) 2010-05-31 20:35:47 +00:00
Tom Adams 6fca512a95 added fix for italian language by Lanta and fixed a bug with the id in votekick menu 2010-05-31 20:05:45 +00:00
Tom Adams 23e2d5f424 fixed votekick menu (#807) 2010-05-31 15:36:20 +00:00
Tom Adams 651cd062e6 fixed english localisation bug 2010-05-31 11:07:58 +00:00
Tom Adams 262b566c94 increased the fontsize of the chat messages 2010-05-30 17:08:54 +00:00
Tom Adams 08df0fe63d added fix for italian translation by Lanta 2010-05-30 14:26:04 +00:00
Thomas 361380d630 *some esthetic changes
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
2010-05-30 12:01:11 +00:00
Tom Adams 47b68170ad auto capture mouse on focus (#728) 2010-05-30 01:00:17 +00:00
Tom Adams 659d66104e fixed dump_binds command (#806) 2010-05-30 00:15:26 +00:00
Tom Adams baa57830ad fixed bubble sort loop (#802), 2 entries in the language files and a possible overrun 2010-05-29 23:57:30 +00:00
Tom Adams e16fdc3f3e added clipping to editboxes (#773) and made their cursors blink 2010-05-29 15:53:57 +00:00
Magnus Auvinen fe5a7105c4 fixed the automatic versioning 2010-05-29 15:20:18 +00:00
Magnus Auvinen 4c0886f087 renamned m_pCarryingCCharacter correctly 2010-05-29 11:26:17 +00:00
Magnus Auvinen f41fa4baba cleaned up some code 2010-05-29 11:23:06 +00:00
Magnus Auvinen d0e0d5b043 cleaned up some comments 2010-05-29 11:21:39 +00:00
Magnus Auvinen 6ff27c56e8 fixed crash with related to player count 2010-05-29 11:12:52 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen e56feb597b added missing headers 2009-10-29 12:14:31 +00:00
Magnus Auvinen 878ede3080 major update with stuff 2009-10-27 14:38:53 +00:00
Magnus Auvinen 7b68ff4277 fixed chaining of console commands, allows snatching updates of console variables. cleaned up some code 2009-06-15 14:01:36 +00:00
Magnus Auvinen 57b2c49d57 fixed so that the demo player doesn't crash when the map isn't found 2009-06-15 13:16:33 +00:00
Magnus Auvinen feade98dae fixed so server stops recording when changing map 2009-06-15 13:04:34 +00:00
Magnus Auvinen 8bd49fe30b some clean up. fixed double server side record messages 2009-06-15 13:01:04 +00:00
Magnus Auvinen f817cb2319 fixed crashing of server side demos due to client_entergame() being processed 2009-06-15 12:40:12 +00:00
Magnus Auvinen d023c72256 fixed demo browser so it's ordered and shows all files 2009-06-15 10:12:16 +00:00
Magnus Auvinen b31243d271 tweaked checkboxes 2009-06-15 09:48:18 +00:00
Magnus Auvinen b3c1bae2e9 cleaned up localization. fixed motd so it shows when connecting to a server 2009-06-15 09:46:25 +00:00
Magnus Auvinen 21c1c3866f translation update 2009-06-15 08:20:29 +00:00
Magnus Auvinen 307cf4aa64 done language selector 2009-06-15 08:15:53 +00:00
Magnus Auvinen ab171f8f30 updated localization 2009-06-15 07:34:25 +00:00
Magnus Auvinen f9ef0293ff renamed algorithms.hpp to algotithm.hpp 2009-06-15 06:50:47 +00:00
Magnus Auvinen 6309d7ad56 continued with localization 2009-06-15 06:45:44 +00:00
Magnus Auvinen bc20e9c433 localization update 2009-06-13 17:18:06 +00:00
Magnus Auvinen 6d9ccee95d base for the localization system 2009-06-13 16:54:04 +00:00
Magnus Auvinen c2f8d0e07a minor cleanup of out commented clode 2009-06-13 08:25:50 +00:00
Magnus Auvinen 69511102de improved the font system even futher. utf8 is now used everywhere. it uses less memory as well 2009-06-13 08:22:37 +00:00
Magnus Auvinen 9254ca61f1 fixed utf8 support 2009-06-07 16:06:03 +00:00
Magnus Auvinen cdc5f26900 new font rendering system using freetype2. only compiles under linux for now 2009-06-07 14:36:54 +00:00
Magnus Auvinen 4bb1df3189 moved 0.5 branch to trunk 2009-05-31 09:44:20 +00:00
Alfred Eriksson b28ede2da2 changed chatmsgs to use time instead of ticks 2009-01-24 16:09:20 +00:00
Magnus Auvinen 01d74a6d4d fixed div by zero bug 2009-01-24 15:22:40 +00:00
Magnus Auvinen 9d3fd4a282 continued work on prediction and game timer 2009-01-24 14:32:12 +00:00
Alfred Eriksson 82f9be8ce0 added help messages for all commands. added syntax in the help msg 2009-01-24 14:10:26 +00:00
Magnus Auvinen 91e337c7ab added ping spike detection 2009-01-24 14:08:09 +00:00
Magnus Auvinen 5f186c8906 fixed so the console show help for each command. not all commands have descriptions however 2009-01-24 13:12:04 +00:00
Alfred Eriksson ae5b47a266 fixed height of toolbox to fit 16p 2009-01-24 13:00:58 +00:00
Magnus Auvinen 0810f3a526 removed the no matching text in the console 2009-01-24 12:32:53 +00:00
Magnus Auvinen 5b20cd6cc9 bumped the version numbers to 0.5.1 2009-01-24 12:31:59 +00:00
Magnus Auvinen 2ea3023410 fixed bug in text rendering 2009-01-24 12:29:36 +00:00
Magnus Auvinen 9d51d47cea added tab completion to the console. works for local and remote 2009-01-24 12:16:02 +00:00
Magnus Auvinen 47c567a5ea fixed so that the refresing master servers doesn't popup under lan and favorites 2009-01-24 10:53:09 +00:00
Magnus Auvinen 2fc86642ef moved refreshing of masters in the client from the server browsers to before we load so we refresh while we are loading 2009-01-24 10:52:45 +00:00
Magnus Auvinen cfe5bd8547 reduced maximum masters from 16 to 4 to make the master server refresh cycle faster 2009-01-24 10:51:50 +00:00
Magnus Auvinen 6696359a28 fixed so that the client connect command works when passed as an argument 2009-01-24 10:46:38 +00:00
Alfred Eriksson affb99fd2b added animation speed controllers to the editor 2009-01-24 10:43:27 +00:00
Alfred Eriksson 598369870d refresh button work for favorites. removed duplicate of the refreshing master servers-msg. we need to refresh the serverlist at the game start 2009-01-24 10:02:29 +00:00
Magnus Auvinen bb73314651 removed old debug spam 2009-01-22 23:29:03 +00:00
Alfred Eriksson a569d5c0c3 fixed compiling errors 2009-01-22 17:22:50 +00:00
Magnus Auvinen 76bffb13a8 added scrollbar to the voting menu 2009-01-21 23:13:37 +00:00
Magnus Auvinen 6a1766f8ce fixed mouse buttons that I kinda fucked up 2009-01-21 23:12:56 +00:00
Magnus Auvinen 998a4cb8df removed some debug variables form release build. cleaned up a bit in the default.bam file 2009-01-21 22:59:52 +00:00
Magnus Auvinen 61ed16ec64 cleaned up mouse input a bit 2009-01-21 22:25:28 +00:00
Magnus Auvinen d3f5340a97 added support for mouse buttons 4-8 2009-01-21 21:52:51 +00:00
Magnus Auvinen 29ca9dfb3a stop recording on map load 2009-01-21 21:21:54 +00:00
Alfred Eriksson fe71008a9b fixed enter in server browser 2009-01-21 21:19:10 +00:00
Magnus Auvinen 6ffd661c78 fixed so the name of the player that calls the vote is in the chat. fixed so that the time remaining on the vote is displayed. reworked the vote box a bit so it's nicer 2009-01-21 21:17:25 +00:00
Magnus Auvinen 2f801d47cf fixed so the 'default' skin is used first when no other skin is found 2009-01-21 21:00:06 +00:00
Magnus Auvinen 0c9dfd81fd fixed vsync option 2009-01-21 20:55:07 +00:00
Magnus Auvinen d3928f559f fixed big messages in the middle of the server browser so users doesn't miss if their filter catches all servers 2009-01-21 20:39:48 +00:00
Alfred Eriksson 759c7b0a1a removed old voting variables 2009-01-21 19:27:21 +00:00
Alfred Eriksson 4c4d28fd25 added snd_buffer_size 2009-01-21 19:21:26 +00:00
Magnus Auvinen f0760ac0d3 improved crapnet so it changes between different ping configurations. improved the game timer 2009-01-21 19:12:09 +00:00
Alfred Eriksson 38a9e32efd fixed quick search box positioning 2009-01-21 18:09:06 +00:00
Alfred Eriksson c24b5f11f2 fixed spawn sound 2009-01-21 11:56:41 +00:00
Magnus Auvinen 24899a13e8 improved the prediction timer to handle crappy connections better 2009-01-21 00:05:07 +00:00
Magnus Auvinen 30695c09a8 increased the number of snapshots the server will hold from 1 second to 3 2009-01-21 00:01:49 +00:00
Magnus Auvinen bd1556ce76 added missing ctf return sound 2009-01-21 00:00:04 +00:00
Magnus Auvinen 0b3c7010d7 moved the fps counter a bit up 2009-01-20 23:59:49 +00:00
Alfred Eriksson b0ef334817 fixed pure server image issue 2009-01-19 14:57:17 +00:00
Magnus Auvinen 013df7ca24 fixed bug that can cause a connection to spam packets 2009-01-18 21:49:03 +00:00
Alfred Eriksson 272769ecc5 fixed the getaddrinfo-issue on win2k. since it doesn't affect other windows versions we don't have to do any recognisation 2009-01-17 22:44:20 +00:00
Alfred Eriksson 2d4f6dffb9 fixed a weird bug causing game layer to be rendered wrong 2009-01-17 22:19:13 +00:00
Alfred Eriksson 335aa0feb2 flag position is only sent when player is near 2009-01-17 17:26:56 +00:00
Alfred Eriksson 397804cdc4 fixed dynamic nameplates bug #674 2009-01-17 17:06:24 +00:00
Alfred Eriksson 96f604f9d1 increased voting time to 25 secs #637 2009-01-17 16:52:57 +00:00
Alfred Eriksson 6c98a36f0f fixed round count bug #630 2009-01-17 16:18:47 +00:00
Alfred Eriksson 843690e85c fixed emote command bug #651 2009-01-17 11:48:05 +00:00
Alfred Eriksson 54def5d97d moved quick search to the bottom and fixed reset filter 2009-01-17 10:33:16 +00:00
Jakob Fries b00dcd6807 added font generator 2009-01-15 21:34:56 +00:00
Joel de Vahl 2d8c4a61b6 ppc sound fix 2009-01-13 19:16:58 +00:00
Magnus Auvinen c491d1c537 fixed perma banning and that input timing shouldn't be vital packets 2009-01-13 18:24:42 +00:00
Joel de Vahl 3da600dc33 OSX server launcher fix 2009-01-13 18:05:08 +00:00
Alfred Eriksson fa02f461c7 fixed round count bug 2009-01-13 17:58:16 +00:00
Magnus Auvinen 70dea7e398 fixed bug that crashes the server if settings tunings in the server config 2009-01-12 21:44:13 +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
Joel de Vahl 1d6668583a initial server launcher for osx 2009-01-12 20:04:14 +00:00
Alfred Eriksson efd0dbab25 added vote command on the server to enforce a vote. added sv_vote_kick_bantime to choose how long a user will be banned at votekick (0 for just kick) thanks to magnet and xara 2009-01-12 19:35:38 +00:00
Alfred Eriksson 783cc0d2b7 fixed #625 2009-01-12 14:43:39 +00:00
Alfred Eriksson 5141ddac4d refreshing the server info when loading 2009-01-12 14:03:19 +00:00
Alfred Eriksson 5103c214bd use enter in editor file dialogs 2009-01-11 18:29:41 +00:00
Magnus Auvinen 035e7a94ff fixed the non-working dynamic nameplates 2009-01-11 17:59:31 +00:00
Magnus Auvinen b717297b63 fixed so that the local player is always rendered above the other players 2009-01-11 17:55:23 +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