H-M-H
7ae4b39574
made recording demos work
...
- videorecorder only works for recording demos now
- demoplayer was modified to allow controll over the time that passed
in order to get perfect fps, IVideo controlls how much time passed,
basically every rendercall sets the time to record the next frame
2019-09-30 20:48:47 +08:00
Learath
25ec19b70b
Set m_Race. Fix #1806
2019-07-18 18:56:24 +03:00
heinrich5991
f31e081bd4
Remove all checking for the gametype in the game
...
OK, maybe not actually remove because it is kept for fallback when the
new method isn't available.
The whole gametype parsing business had the same downsides as user agent
parsing on the web, hence I removed it while keeping behavior the same.
This allows servers to explicitly opt in or out of certain bug
workarounds and other client behavior. This increases the complexity of
different configurations that are available in the client (which is a
bad thing).
2019-06-14 00:28:59 +02:00
def
7e063109c6
Update view immediately when pasting in search in browser
2019-06-02 21:55:38 +02:00
def
e1c9033300
Render news without STL functions ( fixes #1693 )
2019-05-09 21:54:56 +02:00
bors[bot]
a2f44299e0
Merge #1678
...
1678: Handle colors in console r=def- a=Learath2
DEPENDS: #1654
A better way to fix #1581 possibly deprecates #1597
Co-authored-by: Learath <learath2@gmail.com>
2019-04-30 19:39:56 +00:00
Learath
66c89eafb2
Allow binding with modifiers in settings
2019-04-28 20:22:19 +03:00
Learath
588acdda0d
Consolidate color configs, extend debugging
2019-04-27 02:02:31 +03:00
Learath
6c371a9a57
Even more refactoring
2019-04-27 01:11:15 +03:00
Learath
15058330fa
Don't inherit from vector, more cleanup
2019-04-27 00:47:34 +03:00
Learath
93d14a1eca
Inconvenience for windows
2019-04-26 22:36:49 +03:00
Learath
65a17599e1
Add ColorHSVA, phase out more vec3's
2019-04-26 15:06:32 +03:00
Learath
cc36af73be
Cleanup colors
2019-04-24 23:53:26 +03:00
def
94f3d97ddf
Remove unmaintained Android code ( fixes #1575 )
2019-04-10 19:40:50 +02:00
def
fe432b8ae4
Enable a few more GCC warnings
2019-04-09 22:05:21 +02:00
def
c0d3f5fa57
Actually disconnect dummy after confirmation ( fixes #1555 )
2019-03-30 16:59:25 +01:00
Dennis Felsing
0b578c4330
Fix cl_confirm_disconnect/quit_time ( fixes #1550 )
...
-1 now works as described
Split into two settings
2019-03-29 14:56:02 +01:00
Dennis Felsing
95cc357dd6
Merge pull request #1540 from def-/pr-disconnect-time
...
Add cl_confirm_disconnect_quit_time (fixes #1530 )
2019-03-28 23:38:16 +01:00
Dennis Felsing
72200a4e09
Merge pull request #1539 from def-/pr-esc-popup
...
Escape during popup: Only make popup disappear
2019-03-28 23:38:00 +01:00
def
8908102536
Add cl_confirm_disconnect_quit_time ( fixes #1530 )
...
Number of minutes of active racing time before being asked to confirm
disconnecting, disconnecting dummy or quitting through GUI. Defaults to
20 minutes, -1 to disable, 0 to always enable.
Also removed confirmation to quit when in main menu, except when having
an unsaved map in editor.
Spectate and kill should already be safe thanks to server-side kill
protection.
2019-03-25 20:10:38 +01:00
def
d31e9833f9
Escape during popup: Only make popup disappear
...
Not the menu. Otherwise when opening the menu again the popup will
reappear for one frame before disappearing.
2019-03-25 20:01:10 +01:00
def
bf576723a3
Add KoG tab in server browser
...
- As requested by qshar and KoG players
- Similar to DDNet tab
- Info fetched from servers-kog entry from https://info.ddnet.tw/info
- Also supports countries and types
- Doesn't inform whether map has been finished
- Generalized the code a bit but it's still ugly
- Depends on #1533 , also shows KoG servers as official/verified
2019-03-24 23:15:40 +01:00
bors[bot]
b1f3692980
Merge #1514 #1521 #1522 #1523
...
1514: Square and center icons before rendering them on button r=Learath2 a=def-
1521: Remove unused norank icon from browse_icons.png r=heinrich5991 a=def-
1522: Reset authed level in client r=Learath2 a=def-
As reported by jao on Discord:
22:26 jao @Learath2 client auth level needs to reset on server join or something
22:28 jao because other servers don't send it
1523: Make updating nameban reason work r=def- a=12pm
Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-03-19 23:08:37 +00:00
bors[bot]
9d623cb23c
Merge #1516 #1517
...
1516: Remove useless comments r=heinrich5991 a=def-
Not sure if we want to do this kind of cleanup
1517: Fix rendering of checkbox x r=heinrich5991 a=def-
old:
![screenshot-20190319@163151](https://user-images.githubusercontent.com/2335377/54619252-9811d000-4a64-11e9-92cf-df3e3c325566.png )
new:
![screenshot-20190319@163137](https://user-images.githubusercontent.com/2335377/54619237-91835880-4a64-11e9-9775-7625bbcd3cb3.png )
Co-authored-by: def <dennis@felsin9.de>
2019-03-19 21:15:40 +00:00
def
04d67c02f2
Square and center icons before rendering them on button
2019-03-19 17:26:36 +01:00
def
4468f61ee2
Fix rendering of checkbox x
2019-03-19 16:31:24 +01:00
def
2c640b626f
Remove useless comments in menus.cpp
2019-03-19 16:25:07 +01:00
def
f51c12cabe
Fix alignment of x inside button
2019-03-19 16:14:23 +01:00
def
b3ca67e944
Minor code simplification
2019-01-10 15:54:42 +01:00
jupeyy
619a33a7d5
text kerning fix, add new text render flags for accurate positioning
2019-01-06 06:42:57 +01:00
heinrich5991
9ff8b6e2df
Factor out clear button from four different places
2018-09-20 07:43:05 +02:00
def
c8c4fd5617
Fix reconnect timer display...
2018-04-03 21:32:21 +02:00
Jupeyy
2cbb8af75b
add window resize event, and fix some ui things
2018-03-21 15:53:29 +01:00
Jupeyy
c1a962b870
add ui fixes to work with new text renderer
2018-03-13 21:59:07 +01:00
def
73d9ad7615
Really only download ddnet-info.json at correct time
2017-09-08 22:16:00 +02:00
def
c2c453bd45
Make sending name to info.ddnet.tw optional, show dialog at start and some minor fixes
2017-09-07 20:51:46 +02:00
def
89ed22e8d8
Introduce ddnet-info.json
...
- Single json file containing all information for the client
- Fetched from https://info.ddnet.tw/info?name=deen
- Replaces versionsrv, news, ddnet-maps.json and ddnet-ranks.json
- Servers are sorted by most popular ones for respective player
- Always stays < 100 ms response time, compared to occasional 50 s for
old ddnet-ranks.json
2017-09-03 17:42:04 +02:00
heinrich5991
6247aa0c7f
Enable -Wextra
and -Wformat=2
...
Also annotate `dbg_msg`, `str_format` and `str_timestamp_ex` so that the
compiler can determine whether the format strings are correct.
Fix the compiler warnings generated by these extra warnings -- some of
them were security issues.
2017-07-27 20:38:17 +02:00
def
d50b39c530
Fix controls rectangle overlapping topbar and being clickable outside of scope
2017-07-22 17:35:30 +02:00
def
fba3815ddc
Only send password on connection when explicitly asked to ( fixes #788 )
2017-07-15 17:29:20 +02:00
def
9bf84fd4be
Don't keep enabling input in menu all the time ( fixes #706 )
2017-07-15 15:37:05 +02:00
def
569f17e3f3
No need to localize icons
2017-05-17 19:11:32 +02:00
Learath2
09552a6d9f
Get rid of trailing whitespaces
2017-02-21 19:11:43 +03:00
Freddie Wang
e5f23cd87c
Added full IME support
...
Now with display of editing text.
2016-08-14 22:16:06 -07:00
def
f1cdbe8696
More accurate ping by refreshing servers on second frame instead of first (might be caused by intial font rendering)
2016-06-03 19:50:49 +02:00
def
b7d4beccea
Fix buffer overflow when pasting text (thanks to Im 'corneum)
2016-05-11 17:51:27 +02:00
def
bfcf0c4067
Fix auto reconnect abortion
2016-05-07 16:12:23 +02:00
def
1b668047c8
Clean up auto reconnect and make it independent of rendering
2016-05-04 18:23:00 +02:00
def
bad26a3a8a
Pressing shift makes slider move slower ( fixes #455 )
2016-05-03 15:11:52 +02:00
def
a1151fd296
ban -> Timeout
2016-05-01 11:15:45 +02:00
def
13143eac23
Reconnect for timeout instead of bans, some simplification
2016-05-01 11:12:07 +02:00
def
4761608329
Input fixes from TW master for mouse wheel
2016-04-30 20:11:26 +02:00
def
a1403ef457
Make sure GetClipboardText's null returns are handled properly
2016-04-29 21:56:38 +02:00
def
632db36fe4
Add clipboard copy&paste support (by swick)
2016-04-29 21:56:38 +02:00
Henningstone
8279855bb0
Show ingame Ghost tab only on race servers
2016-04-28 22:40:46 +02:00
def
ec7d28ed86
Change ingame menu layout a bit: Browser, Ghost directly instead of Network tab
2016-04-27 20:14:03 +02:00
Tim Schumacher
6e7dbec76e
made fading border in menu more customizeable
2016-02-16 17:04:46 +01:00
def
ed49e3214a
Some more minor settings menu fixes
2015-08-28 20:44:07 +02:00
def
d95145819f
Fix oversize headers on Android
2015-06-22 01:39:08 +02:00
def
3cedbd5061
Revert "Add key binding for R to refresh serverbrowser"
...
This reverts commit db60bf6527
.
2015-05-12 23:28:10 +02:00
def
db60bf6527
Add key binding for R to refresh serverbrowser
2015-05-11 21:57:11 +02:00
def
b6008f5b20
Only refresh serverbrowser when necessary
2015-05-11 21:51:06 +02:00
def
32feea555f
Also fix popup title flow on disconnect extra text (not just title)
2015-04-27 23:17:28 +02:00
def
aa517af7c7
Don't let popup title flow out of box
2015-03-29 14:20:34 +02:00
Learath
09ce649238
First get rid of the old autoupdate
...
Conflicts:
src/engine/client/client.cpp
src/engine/client/client.h
Conflicts:
src/engine/shared/config_variables.h
2015-02-23 20:23:35 +02:00
def
ebf331febb
Show the function of search and exclusion edit boxes when empty (Suggestion by Saavik)
2014-12-24 03:38:40 +01:00
def
3c833bd93e
Make the initial ping in serverbrowser less wrong (still not perfect)
2014-09-20 16:20:27 +02:00
def
4ea77f1080
Oops
2014-09-20 16:11:29 +02:00
def
060b794a9d
Suggest Novice servers to new players
2014-09-20 16:08:11 +02:00
def
520b84328f
Fix 5:4 resolution in menu
2014-09-20 13:37:00 +02:00
east
e732008157
DDNet serverlist added
2014-09-13 16:36:25 +02:00
def
c6b63c34ba
Don't show quit popup on update
2014-08-26 22:06:35 +02:00
east
070ebe2895
merge fixed
2014-08-23 17:57:32 +02:00
east
8624d0a747
DemoPlayer: Save dialog added
2014-08-23 17:48:04 +02:00
def
1c4fac8afd
Display map name while downloading
2014-08-16 01:06:17 +02:00
def
5e89631637
Revert "Add 00Necrid skin"
...
This reverts commit b52afd5464
.
2014-07-10 16:46:46 +02:00
def
b52afd5464
Add 00Necrid skin
2014-07-10 16:19:56 +02:00
def
c1eb944057
Minor fix
2014-07-08 21:04:04 +02:00
def
15ff17d8f8
Cleanup of some menus, added editor button, added disconnect question
2014-07-08 20:21:19 +02:00
def
e6bcb528cd
Cleanup
2014-06-27 10:13:57 +02:00
CookieMichal
b9943706b3
Added:
...
* Second DDNet settings page with some settings
* Auto reconnect feature
* In-game commands:
- reconnect_ban
- reconnect_ban_timeout
- reconnect_full
- reconnect_full_timeout
Changed:
* Disconnected popup
* Name for first DDNet settings page
Signed-off-by: CookieMichal <MrCookieMichal@gmail.com>
2014-06-27 00:28:57 +02:00
def
7875c2ec36
Android support (by Pelya)
2014-06-16 13:29:18 +02:00
def
c67742f60a
Add news
2014-06-05 12:11:41 +02:00
def
1296b1bf49
Fix compile for Mac
2014-05-17 19:30:24 +02:00
def
42811dc896
Autoupdater asks for permission to update + Autoupdater fixes
2014-05-17 14:28:50 +02:00
def
4f8171fcde
Revert "Fix menus for 1280x1024"
...
This reverts commit 17478a4f17
.
2014-05-08 14:08:15 +02:00
def
17478a4f17
Fix menus for 1280x1024
2014-05-06 13:38:59 +02:00
def
9f509eeedb
Fix: Dummy setting updates
2014-04-28 15:19:57 +02:00
def
7bcc51d488
Basic updating (thanks to unsigned char*
2014-04-27 05:01:03 +02:00
def
c6c438fe02
Fix: Only set standard search when starting for the first time
2014-02-15 01:19:07 +01:00
def
e88e0698c7
Name stuff
2014-01-03 03:06:23 +01:00
def
3eaad43b6b
Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
...
Conflicts:
bam.lua
data/languages/index.txt
src/engine/server/server.cpp
src/engine/shared/network_server.cpp
src/game/client/components/chat.cpp
src/game/client/components/menus_settings.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/version.h
2013-12-26 18:02:22 +01:00
def
db7154273d
ddnet -> Network
2013-10-10 12:10:10 +02:00
def
dc6d2305d5
Add AntiPing
2013-10-09 16:02:23 +02:00
def
62c2e1211b
Fix DDRace menu corner to look correct
2013-08-03 15:24:20 +02:00
oy
f0e09f50d9
improved chat msg spam protection
2013-04-01 20:30:58 +02:00
oy
878af82d8f
fixed frozen GUI caused by popups
2013-03-16 15:30:40 +01:00
oy
86708818e9
fixed wrong map download speed when switching to the editor while downloading. Closes #951
2013-02-24 17:34:02 +01:00
GreYFoX
cd4ba53bae
Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
...
Conflicts:
bam.lua
scripts/build.py
scripts/make_release.py
src/engine/server.h
src/game/client/gameclient.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/player.cpp
src/game/version.h
2012-04-12 02:09:31 +02:00
oy
e8f9145a0d
deactivate player ignore setting if show just friends chat is active and player isn't a friend
2012-01-10 23:03:23 +01:00
oy
e960cbdff3
added a config to display the code string of a country flag instead of the image. Closes #897
2012-01-08 18:16:38 +01:00
oy
2785293469
don't start playing the music again if we're quitting
2012-01-06 20:03:57 +01:00
oy
b592d7a591
cleaned up playing of global sounds
2012-01-06 19:38:40 +01:00
GreYFoX
c46f3e06e7
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
2012-01-04 20:10:07 +02:00
Magnus Auvinen
8e56885795
initial commit of the threaded graphics. can start game and render the gui. no textures at the moment. still waits for the swap for now
2011-12-31 01:06:04 +01:00
Magnus Auvinen
8ffe582615
ugly incomplete hack to put the rendering into another thread so we don't have to wait for the flip
2011-12-30 16:02:22 +01:00
GreYFoX
5ebf60891c
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
2011-12-01 19:48:09 +02:00
oy
05f77f64af
added caching for the play command. Closes #891
2011-11-30 01:41:00 +01:00
GreYFoX
ff696bad6c
Mac Loves Cyclic Includes
2011-08-31 13:56:04 +02:00
GreYFoX
7e24be5d83
Version 1.091a
2011-08-31 12:10:15 +02:00
GreYFoX
de4a95c5d2
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
2011-08-20 06:50: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
c6fd4a2cc5
General whitespace and tab cleanup
2011-08-11 10:59:14 +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
oy
7648ba3024
added a different mouse sens for menus/editor
2011-07-03 00:36:07 +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
e8938e3d80
set the minimum of seconds remaining in map downloading popup to 1
2011-06-27 22:35:23 +02:00
oy
1239150846
fixed password popup UI issue. Closes #583
2011-06-27 16:39:23 +02:00
oy
fb309436b4
improved friends feature
2011-06-26 17:10:13 +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
Choupom
f8d21b48af
fixed a l10n bug for some languages
2011-05-03 23:10:20 +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
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
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
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
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
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
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
7bd79f9f43
added remove_favorite command by Choupom
2011-03-27 18:05:11 +02:00
oy
ae325c873f
added friends feature. Closes #24
2011-03-23 13:06:35 +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
0313485d6b
fixed that PageMenu buttons change their inactive colour ingame
2011-03-17 17:48:45 +01:00
oy
b4bec53359
added clan name and country flag selector to the player settings
2011-03-16 21:31:55 +01:00
oy
a04eb45354
added rename button to the demo browser and updated localisation entries
2011-03-12 19:08:44 +01:00
oy
0bc13c91eb
made cl_threadsoundloading work again
2011-02-27 17:56:03 +01:00
GreYFoX
5ffe4e9429
Added In-Game Page DDRace
2011-02-23 09:33:21 +02:00
GreYFoXGTi
78ee6148f8
SortHash
...
Loading String
2011-02-16 12:22:55 +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
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
oy
c2ad73cfe8
fixed negative download speed. Closes #473
2011-02-10 12:38:20 +01: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
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
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
bf6fcc20f4
added an error popup on startup when the sound couldn't be initialised. Closes #425
2011-01-17 13:28:15 +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
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
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
bcba9e5c89
moved HslToRgb stuff
2011-01-04 11:58:25 +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
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
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
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
7a6006087c
removed duplicate note in password popup
2010-11-20 23:39:17 +01:00
Sworddragon
fc9211c777
Updated copyrights
2010-11-20 21:26:06 +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
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
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
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
c6fda43369
Now can Join Vanilla servers. Closes #96 .
2010-10-19 18:30:45 +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
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
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
de7504282c
made edit boxes scrollable. Closes #96
2010-10-11 01:36:46 +02:00
Choupom
61201fea13
added reason to kick a player in the callvote tab
2010-10-11 00:31:21 +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
896634a061
Total Cleanup
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
GreYFoXGTi
fa379a806a
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/server/server.cpp
src/game/client/components/scoreboard.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
2010-09-13 07:49:01 +03:00
oy
c52ee7baa9
unbind a key with right mouse button in the controls menu. Closes #67
2010-09-12 17:15:09 +02:00
oy
5437513a0d
use escape key to abort binding a control key in the menu
2010-09-12 13:40:24 +02:00
oy
e226b47212
close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111
2010-09-12 12:43:03 +02:00
GreYFoXGTi
0b1b949a3c
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamemodes/ctf.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 05:37:08 +02:00
oy
e31b125a0d
use the numpad enter key as well. Closes #166
2010-09-08 02:32:41 +02: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
oy
5588e1ec8c
fixed selected index when deleting a demo and added a popup to confirm the deletion
2010-09-05 17:53:31 +02:00
Choupom
fcfaa8389f
added Remove button in demos browser ( #66 )
2010-09-05 17:40:51 +02:00
GreYFoXGTi
11f480a79b
Changed the Loading String to Loading DDRace Client
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 19:59:24 +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