edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-10-21 16:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
16246 commits 1 branch 427 tags 412 MiB
Commit graph

276 commits

Author SHA1 Message Date
def 81bb7e661c Improve list box behaviour, make it more consistent 
Make keys work after searching in vote menu

Unify some duplicated code
 2020-11-13 08:03:34 +01:00
bors[bot] 9a257a76e1
Merge #3195 
3195: Use str_truncate more often r=heinrich5991 a=def-

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2020-10-26 12:08:34 +00:00
Dennis Felsing 9c8c36456b Use str_truncate more often 2020-10-26 12:56:21 +01:00
def 67178b0ea0 Use str_time/str_time_float everywhere 2020-10-18 23:47:09 +02:00
heinrich5991 6ff53358d3 Remove code for CRC in most places, except where needed for net compat 
This should path the way to remove it altogether in the future.
 2020-10-14 17:08:58 +02:00
Andrii 52efb23545 Update demo browser on demo save 2020-10-11 15:45:31 +03:00
Jupeyy a4b32d19a1 Init date for demo dirs 2020-10-08 07:20:32 +02:00
def d5fc613b8b Revert "Show File button in demo player" 
As reported by Soreu, doesn't work on Windows (Can't open file warning
pops up)

This reverts commit 8efff70d88.
 2020-10-04 18:24:15 +02:00
def 8efff70d88 Show File button in demo player 
to easily get the file instead of having to search for it in the file
browser again. Complements #2946
 2020-09-29 22:57:55 +02:00
Jupeyy 456625893b Add directory buttons 2020-09-29 10:24:40 +02:00
Jupeyy 0e71a47708 Add customization 2020-09-28 23:21:32 +02:00
def 3be8a592e5 Run clang-format 
Purely automatic change. In case of conflict with this change, apply the
other change and rerun the formatting to restore it:

$ python scripts/fix_style.py
 2020-09-26 21:50:15 +02:00
Jupeyy eb7c84cd7f Add hover for demo list 2020-09-22 18:42:03 +02:00
def 1cf68d7191 Fix localizing demo list 
You can't store the result of Localize in a static, it will be removed
by switching to another language.

Thanks to Jupeyy for report
 2020-09-18 23:33:51 +02:00
def 427450ddc3 Demo viewer: Ignore shortcuts when popup is open 
As reported by Shyzo on Discord
 2020-09-18 07:57:43 +02:00
Jupeyy 1fe09f496c Add some decent hover effects and colors 2020-09-17 15:47:13 +02:00
def 7af517009c Implement context for translations (largely taken from Teeworlds) 
Missing: scripts/languages doesn't work yet, but the context can be
added manually, see german.txt for an example.
 2020-09-15 10:30:49 +02:00
def 7bea697114 Add some keyboard shortcuts for demos 2020-09-08 11:42:52 +02:00
def 757998e7d0 Fix some 5:4 rendering in demo menu & recorder menu 2020-09-08 11:37:37 +02:00
Fireball ab9b96ddb2 Backported fix for Text() incorrect parameter type (int -> float) 
The original fix was done by @oy for 0.7.4.
 2020-07-15 20:49:14 +01:00
def 2d6e56fec8 Translation fixes 
- Code didn't work with newlines, get rid of them
- Some stylistic improvements
 2020-06-26 18:34:50 +02:00
def 690fb852df Don't reset client on demo menu events 2020-06-02 13:22:00 +02:00
sirius 7710b88670 Merge branch 'master' of https://github.com/ddnet/ddnet into demo_render2 2020-01-01 18:36:49 +08:00
Dennis Felsing 4171e8751f
Merge pull request #1939 from Learath2/dd_pr_demoload 
Always try extracting map before fail. Fix #1886
 2019-12-17 21:20:10 +01:00
Learath2 3784f5bea4 Use a UUID, Cleanup code and UI 2019-12-17 15:44:54 +01:00
Magnus Auvinen 6a6a5f00c9 more typesafty in the graphics. introduced the IGraphics::CTextureHandle 
Edited by @ChillerDragon to fit in ddnet
(cherry picked from commit cb95e8dfe8)
 2019-11-22 18:08:37 +01:00
Sirius 45263ebdd0
Merge branch 'master' into demo_render2 2019-10-31 22:08:49 +08:00
Learath 7cdd050fee Add SHA to demos. Bump Demo Version 2019-10-14 02:27:08 +02:00
12pm 36df86fcd2 Add toggle keyboard shortcuts button to demo player 
Demo shortcuts can be annoying if you have other binds on them.

Icons made by eNJi
 2019-10-05 18:06:58 +02:00
sirius b0ee5671ff rebased to ef32fc4 2019-10-02 09:51:33 +08:00
sirius d9d1e8b309 add if defined to newly added lines 2019-09-30 20:54:19 +08:00
sirius a71339366b add function to appoint video name, but will segment fault 2019-09-30 20:52:25 +08:00
sirius 1375fbb95d add a button to render whole demo 2019-09-30 20:52:24 +08:00
12pm 28f26a09cc Ignore binds in slice save menu 
Should fix a bug reported in #1702
 2019-05-19 13:33:30 +02:00
Learath2 b2f92b09eb Show the correct button when paused 2019-05-11 03:02:00 +02: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
12pm 808bb1303a Disable demo shortcuts in console 
As reported here: https://forum.ddnet.tw/viewtopic.php?f=3&p=67807#p67807
 2019-04-23 14:52:32 +02:00
12pm 6e880644af Add some demo player shortcuts 2019-04-15 21:08:12 +02:00
Dennis Felsing cde07b420b Implement changes suggested by -Wuseless-cast 
But don't enable it yet because I'm not sure what the best way is.
 2019-04-11 19:54:43 +02:00
def 94f3d97ddf Remove unmaintained Android code (fixes #1575) 2019-04-10 19:40:50 +02:00
def c3e36ee483 Always initialize m_InfosLoaded 2019-04-08 22:13:47 +02: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
def 22f278fdb8 Demo browser: Make Fetch Info a checkbot instead 
And persist the result. Helps with the workflow described by Shyzo on
Discord:

> I mean after i press ctrl-f or fetch info. then i want to sort by marker (from ... to 0) and just delete every demo without a marker. either in a whole (not possible i think) or just one by one. but I think after deleting one demo the order of demos change again
> so i have to fetch info again, delete one. fetch info again. delete one
> and so on
 2019-03-19 18:28:10 +01:00
def f9d9fee314 Demo browser: Show markers (fixes #329) 
- Fetch Headers button
- Display Markers & Length columns
- Display footer info
- Don't rescan directory when not required
- Clean up code a bit
 2019-01-09 08:25:03 +01:00
heinrich5991 5c4e819e44 Use str_startswith, str_endswith instead of ad-hoc implementations 2018-07-26 14:18:23 +02:00
Jupeyy c7114e734c more ui text positioning fixes 2018-04-04 02:40:30 +02:00
Jupeyy c1a962b870 add ui fixes to work with new text renderer 2018-03-13 21:59:07 +01:00
Learath2 61f0461d46 Style 2018-02-13 17:15:16 +01:00
Learath2 8cfebaa0b2 Fix #1031 2018-02-13 03:45:43 +01:00
Savander fa544dc0e6
Localize Date, Demo 2017-10-28 01:22:11 +02:00
def 5d8a0ddc1e Add time in console 2017-08-04 22:38:22 +02:00
def 147005ea42 ask before overwriting demo file when slicing (fixes #806) 2017-07-24 18:33:11 +02:00
def 2d68aed009 More settings in controls menu. use listbox (fixes #802) 2017-07-22 13:41:18 +02:00
def 37a08e8ef0 Support pageup, pagedown, home, end buttons in menus 2017-07-04 22:07:02 +02:00
Learath2 6377355d4a Use %g. Get rid of comparison 2017-03-22 23:11:03 +01:00
Learath2 625433ed42 Fix double slowdown. Display the correct speed. Fixes #607 2017-03-22 23:11:03 +01:00
heinrich5991 e3f2316106 Revert "Revert "Refactor dummy input and demo filtering"" 
This reverts commit 187560c8c0.
 2017-02-28 10:08:14 +01:00
Dennis Felsing 187560c8c0 Revert "Refactor dummy input and demo filtering" 
This reverts commit 8375f4888e.
 2017-02-28 08:15:35 +01:00
heinrich5991 8375f4888e Refactor dummy input and demo filtering 
Remove references to src/game/ from src/engine/
 2017-02-23 14:13:14 +01:00
Dennis Felsing c92e10914a Refactor demo speed setting, add 1.5x speed (fixes #568) 2016-10-28 09:31:22 +02:00
def 4761608329 Input fixes from TW master for mouse wheel 2016-04-30 20:11:26 +02:00
def 0667864657 Fix double click in demos menu 2016-04-30 18:18:22 +02:00
def 2e0ca0f4b4 Fix SDL2 compilation 2016-04-29 21:58:24 +02:00
def 97743b8e70 Also ctrl-r to refresh and in demo browser as well 2016-04-29 20:39:25 +02:00
def d3a411afa6 Key up/down only change selected server, not friend list 2016-04-27 20:26:33 +02:00
def b495b1681c Double click works on votes (and vote window disappears after server setting vote) 2016-04-27 20:04:31 +02:00
def 0f5611c2f0 Add function to filter chat out of demo when slicing (fixes #382) 2016-04-27 17:05:30 +02:00
def 865d50950d Put space more to left in editor browser 2015-08-28 20:34:19 +02:00
def 703f1bc99d Hopefully fix Android compilation 2015-08-27 20:52:06 +02:00
east ff09eff526 arrow up/down in demo browser 2015-08-27 16:59:36 +02:00
def f27ee72d2d Remove unused variables 2015-08-27 15:34:33 +02:00
def 33f20d7dd3 Indentation fixes 2015-08-27 15:33:24 +02:00
east cb4909d656 Changed Created: info 2015-08-27 15:05:24 +02:00
east 675c6eb1e0 Demo browser column listbox added 2015-08-27 15:05:24 +02:00
east da17b795c5 progress on column listbox 2015-08-27 15:05:24 +02:00
def cc63e9fc89 Fix demo cutter to add .demo file ending 2015-07-14 13:43:44 +02:00
def 2077a4f83e Add a string for localization 2015-07-14 13:43:24 +02:00
def 6e8ada1ac8 Fix whitespaces a bit 2015-07-09 02:12:35 +02:00
def 6b25d81938 Fix demo cutting buttons with 5:4 resolutions 2015-05-08 12:31:55 +02:00
def fc9ab26be0 Repopulate demo list after closing demo player because a new demo could have been created (Thanks Saavik) 2014-09-05 21:17:04 +02:00
def 489349d30b Use × instead of x to indicate speed in demo player 2014-08-29 16:13:28 +02:00
east 862a520857 DemoPlayer: Refuse to overwrite demo 2014-08-25 11:19:00 +02:00
east 8624d0a747 DemoPlayer: Save dialog added 2014-08-23 17:48:04 +02:00
east bb8076a3ba DemoPlayer: Additional speed meter added 2014-08-22 10:00:48 +02:00
east f1ee4aa48c CDemoEditor: slice begin/end markers added 2014-08-13 17:32:03 +02:00
east 65b2426349 CDemoEditor: added new buttons to demo player 2014-08-13 16:35:15 +02:00
def cf89fcd7a6 Demo map length in MiB and KiB instead of B 2014-07-08 20:35:27 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def 221fd3a02b Fix 2014-01-22 17:19:21 +01:00
def 7465939054 More exact scrolling in Demo Player 2014-01-22 17:14:47 +01:00
def ca9b68b317 Hide demo player fully 2014-01-15 15:08:00 +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 fa81141110 added demo markers by Choupom. Closes #837 2012-01-10 23:13:19 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
oy b99ac459be fixed envelope rendering when seeking in the demo player 2011-12-04 14:04:12 +01:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +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
oy 9845d757ef removed file extension from the demo name in the demo player 2011-06-09 22:44:22 +02:00
GreYFoX eb70e55ead Merge branch 'master' of git://github.com/oy/teeworlds 2011-05-17 09:00:25 +02:00
PsychoGod 210d98666c Scroll fix, protect scrolling 2 windows at the same time 2011-05-17 01:15:54 +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 e4c85b00db fixed that some demos show a negative length in the demo browser. Closes #660 2011-05-09 17:55:12 +02:00
oy 5b2f5f0778 fixed problem with connecting on double click in the server browser. Closes #662 2011-05-05 01:56:31 +02:00
oy 726bbbbdb0 added missing localisation in the demo player 2011-04-16 18:37:57 +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
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 c20a33ede7 added more space for translations in demo details. Closes #592 2011-04-03 23:33:43 +02:00
oy 9712e4004c improved the add/remove friend and ignore/notice chat buttons 2011-03-29 00:48:36 +02:00
oy 867f944459 added graphic buttons for remove/add friend and chat ignore/notice 2011-03-28 21:10:37 +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 b4bec53359 added clan name and country flag selector to the player settings 2011-03-16 21:31:55 +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 b834426548 fixed several problems with spectator view in game and demo player. Closes #83 2011-03-12 18:07:57 +01:00
oy 088ec3e2f3 made the client's map search work with sub folders. Closes #254 2011-02-21 11:23:30 +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
SushiTee c0b905f852 -fixed compiler warnings 
-fixed mac compiling
 2011-01-26 14:45:44 +02:00
oy 3727deee43 increased mouse scroll value from 1 to 3 in the other listboxes too 2011-01-23 17:54:19 +01: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 13902fef6c show an error popup when demo deletion fails 2011-01-05 22:22:07 +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
oy 7414271309 check the return values of RemoveFile and CreateFolder 2010-12-07 23:47:41 +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
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
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 1209ad9baf fixed a problem with the skin selector 2010-10-25 21:23:05 +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
oy 5801326ebc fixed line endings 2010-10-13 12:59:30 +02:00
oy 85b9c60158 added info in the demo browser by Choupom 2010-10-09 13:27:21 +02:00
oy a075889312 fixed a listing problem in the demo browser 2010-10-08 00:13:05 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
oy 2f388139c1 fixed auto-scrolling in server browser and listbox 2010-09-30 01:13:12 +02:00
oy aaf8e2bc8e cleaned up demo listing and fixed its sorting. Closes #73 2010-09-29 00:53:53 +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 cf2d46d3ba increased deadzone when seeking through the file in the demo player 2010-09-19 16:36:10 +02:00
oy a2083b31e3 fixed last commit 2010-09-16 12:48:32 +02:00
Choupom 582763bc21 made folders in editor (#80) 2010-09-16 12:28:10 +02:00
oy d4b145a8ee fixed Gui lock while deleting/reading demos. Closes #167 2010-09-08 02:27:48 +02:00
oy eecdff0cf5 fixed overlapping in last commit 2010-09-07 19:31:20 +02:00
ghost 56c4081da4 Demo name is now showed while playing a demo file 2010-09-07 19:12:11 +02:00
oy 0cfd1de760 fixed line endings 2010-09-05 19:06:27 +02:00