Commit graph

1871 commits

Author SHA1 Message Date
oy a7a1aaff1d added game layer tile set picker + brush manipulation fix by Speedy-Consoles. #1159 2015-08-31 19:36:46 +02:00
oy 1a9e7a1ed0 cleaned up map handling. #1227 2015-08-31 19:35:10 +02:00
oy 43e38941dd Added fix for intersectline by Speedy-Consoles. #1205 2015-08-31 19:08:48 +02:00
Choupom b18d218c98 refactored CFlag 2015-08-30 18:48:55 +02:00
Choupom e86a486688 refactored CEntity 2015-08-30 18:46:46 +02:00
oy 66d9c5f790 reset tab completion just in case of manipulation. #1340 2015-08-30 10:00:13 +02:00
Zwelf b65b02c345 Fixes issues pointed out by heinrich5991
Byte lenghts of 128 Bytes is enouth and DDNet is using this lenghts too.
2015-08-30 08:54:42 +02:00
Zwelf 1df383ad90 Added initialisation of the variable aBuf
Sorry, didn't find this in the history of ddnet.
2015-08-30 08:54:42 +02:00
def f8278ec032 Display map name while downloading
Conflicts:
	src/engine/client.h
	src/engine/client/client.h
2015-08-30 08:54:41 +02:00
oy 329e6261f3 removed the extra projectile. #1381
Conflicts:
	src/game/client/gameclient.cpp
	src/game/server/entities/character.cpp
2015-08-30 08:46:51 +02:00
oy 7f78915171 fixed mouse lock in the editor. Closes #1383 2015-08-30 08:42:28 +02:00
oy f9f9249477 fixed frozen input when leaving a server with active chat 2015-08-30 08:41:26 +02:00
oy cc2dcd865a force vital check on essential cl/srv messages and added additional sequence checking
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
2015-08-30 08:31:29 +02:00
oy e592d1b1fa fixed updating the menu map on change 2015-04-02 19:28:38 +02:00
heinrich5991 cd26c89c2f Remove unnecessary use of the comma operator 2015-03-31 17:44:22 +02:00
oy 2283a3b785 fixed some quad rendering. Closes #1333 2015-03-28 10:49:02 +01:00
oy 39f1d3a7e2 fixed key handling for the console/binds. Closes #1331 2015-03-26 16:01:34 +01:00
oy 999163301e fixed a line separator 2015-03-22 15:24:26 +01:00
oy 663c39655e fixed last commit 2015-03-22 14:38:22 +01:00
oy 721739ed42 Merge remote-tracking branch 'remotes/swick/sdl2'
Conflicts:
	src/engine/client/backend_sdl.cpp
	src/engine/client/graphics_threaded.h
	src/engine/shared/config_variables.h
2015-03-22 14:10:53 +01:00
oy cdcc641af3 made day/night detection more accurate and did some cleanup. Closes #1304 2015-03-22 13:44:19 +01:00
oy 191d7fab81 fixed custom skin colour picker 2015-03-22 13:28:28 +01:00
oy fa8959311e skip multiple skins during loading and prevent saving skin as special one 2015-03-22 13:15:18 +01:00
oy d0a028ae7e fixed saving skin with a name that already exists. Closes #1330 2015-03-22 12:54:08 +01:00
oy 939be9c949 cleaned up camera positions for the background map a bit 2015-03-10 19:37:21 +01:00
BeaR 2aab20bb80 Fix camera movement in the menu
* Wrap menupage updates
* Remove magic value
2015-03-10 19:24:43 +01:00
oy c727995ffa open quit popup when pressing escape in the main menu 2015-03-04 12:24:48 +01:00
oy 6a1a0d800f fixed last commit 2015-03-04 11:15:54 +01:00
Henningstone 7e180dfdb9 Make seekbar toggable/hide automatically 2015-03-04 10:54:56 +01:00
BeaR 3add923231 Add editor to adjust z-index of quads
* Keybinds home/end/pageup/pagedown to move the selected quad to front/back/up/down
2015-02-26 19:53:06 +01:00
oy 99f26dc020 fixed some problems with the pma interpolation. #1317 2015-02-26 19:31:31 +01:00
oy b64c8dff25 fixed problems with the dilate fix. Closes #1317 2015-02-24 12:32:24 +01:00
oy 6506cf4ddf fixed last commit, generalized config saving and path check 2015-02-18 14:04:26 +01:00
oy 77daedc814 fixed last commit and removed some outdated stuff 2015-01-24 18:40:49 +01:00
BeaR a2cb7d339a Mark some return values as const 2015-01-24 18:19:38 +01:00
BeaR a929a99fd9 Refactoring: Mark several functions as 'const', fix some return values and cleanup mapinfo struct 2015-01-24 18:19:24 +01:00
BeaR 718510e0b1 Removed unused directory 2015-01-24 17:44:59 +01:00
oy fb85b582bf load background map in the menu regarding current day or night time 2015-01-18 19:28:39 +01:00
oy 98b6510b9c fixed loading of the background map 2015-01-18 19:07:28 +01:00
oy 8ac9ec794e moved content and added data creation to the build 2015-01-18 18:44:11 +01:00
oy 952cbd9d3b removed dead code. Closes #1284 2015-01-18 16:10:25 +01:00
oy 5c83148fc6 added +/- for speed-up/slow-down in the demo player. Closes #1268 2015-01-18 15:57:26 +01:00
Henningstone d4f749c88e Add Spacebar for toggling Play/Pause
Closes #1268; Added spacebar for swiching between
play/pause in demoplayer
2015-01-18 15:28:53 +01:00
oy 6821703f95 fixed wrapping 2015-01-12 05:58:04 +01:00
BeaR d4a752e446 Fix texture wrapping mode for menuimages 2015-01-12 05:55:07 +01:00
BeaR d1ee52c372 Implement stricter panning(audio), make pan depending on screen width and remove useless channel pan value 2014-12-21 18:48:44 +01:00
oy dcd5ef27c0 Fixed overlapping exit message. Closes #1288 2014-12-21 13:46:57 +01:00
BeaR 3c4bf03783 Editor: Scale indicator for selected quads with zoomlevel 2014-12-21 13:35:03 +01:00
BeaR 551b21162f Fix variable name formatting 2014-12-21 13:21:55 +01:00
BeaR a5debee342 Move color conversion functions to seperate header and add variables to customize editor colors 2014-12-21 13:21:50 +01:00
BeaR fee5f5ec9f Fix menumap animations 2014-12-21 13:09:43 +01:00
BeaR 656b1e9071 Fix loading of menuimages and fix foreground mapanimations 2014-12-21 13:09:32 +01:00
BeaR 5ba116ad13 Remove code duplication (by heinrich5991) 2014-12-21 12:56:03 +01:00
BeaR a030d7c494 Correctly retrieve the mouse position and adjust worldoffset 2014-12-21 12:55:55 +01:00
BeaR 90617421eb Editor: Add feature to zoom to the current mouse position 2014-12-21 12:55:47 +01:00
BeaR b34e455e4c Allow to set different wrapmodes for each texcoord and soften texture clamping restrictions for quads 2014-12-21 12:52:28 +01:00
BeaR de82ad7a26 Editor: Add texture coordinates to quad properties and fix wrong fxp conversion 2014-12-21 12:42:26 +01:00
BeaR 5f99e6841f Fix image button darkening 2014-12-21 12:33:56 +01:00
BeaR 792900fb3d Editor: Show if images are used by layers (originally by deen) 2014-12-21 12:33:48 +01:00
BeaR 26c3f11813 Editor: Hide screen sizes if tilepicker is active 2014-07-29 13:26:35 +02:00
oy 03c171d2e4 Merge pull request #1243 from cinaera/pr_fixes
Cleanup: Fix code format, remove hardcoded value and add some documentat...
2014-07-12 13:20:46 +02:00
oy 7b9c75eda1 fixed an issue with the ammo regeneration. thx Ich 2014-07-12 13:15:14 +02:00
Sebastian Wick dcd4f9ae7a moving to sdl2, mouse input lags; do not use! 2014-06-29 21:02:09 +02:00
Sebastian Wick 8e8b1516e2 moving to sdl2, input is broken, build is broken; do not use 2014-06-29 19:07:46 +02:00
BeaR b99e4304ed Cleanup: Fix code format, remove hardcoded value and add some documentation 2014-06-24 13:19:52 +02:00
oy e7f1a8ab79 fixed faulty includes 2014-06-22 13:55:17 +02:00
oy 3dffd6bc9c fixed last commit 2014-06-22 13:36:58 +02:00
oy 8178302e02 Merge pull request #1149 from Speedy-Consoles/weapon_cleanup
weapon code cleanup
2014-06-22 13:29:19 +02:00
oy 5eee57f1e7 changed tattoos to markings. Closes #1131 2014-06-22 12:53:22 +02:00
oy 456a1963be removed some unused code 2014-06-22 12:29:53 +02:00
oy 2448ed14f0 fixed maximum chat message length on client-side. #1151 2014-06-22 12:28:31 +02:00
oy 27da041e00 Merge pull request #1072 from minus7/new-bam-file
rewrote bam.lua to be cleaner
2014-06-21 19:59:28 +02:00
BeaR 2c4775cf5a Prevent texture bleeding on quad rendering 2014-06-21 18:10:35 +02:00
oy ffd9c7b0b3 Merge pull request #1231 from cinaera/demoplayer
Improve the sensitivity of the demoplayer timeline and visually better m...
2014-06-21 13:37:44 +02:00
oy de663a71f1 Merge pull request #1229 from cinaera/mapitem
Remove outdated code and add some version enums for safety
2014-06-21 13:23:31 +02:00
oy c92d430f4a Merge pull request #1225 from cinaera/envelope_legacy
Fix envelopes rendering (incorrect loading)
2014-06-21 13:10:00 +02:00
BeaR aab36332d9 Improve the sensitivity of the demoplayer timeline and visually better match the seekbar slider with the actual position 2014-06-13 13:50:43 +02:00
BeaR f3ca2403fd Fix code formating 2014-06-11 16:37:38 +02:00
BeaR 04ee8b20a1 UI: Add alignment enums 2014-06-11 07:26:18 +02:00
BeaR bbed4d73d3 Removed outdated maploading code 2014-06-10 10:34:33 +02:00
BeaR 6d75bcc89a Add version enums to some mapitems for safety 2014-06-10 10:31:10 +02:00
BeaR a56a14af72 Only load envelope points once at mapload 2014-06-04 17:51:03 +02:00
BeaR 65be3d8766 Fix envelopes rendering (incorrect loading of legacy ones) 2014-06-04 17:50:57 +02:00
BeaR 52faacc45e Fix building (missing header) 2014-05-30 13:52:20 +02:00
BeaR e8b6ce4288 Fix header inclusion 2014-05-26 12:02:54 +02:00
BeaR 2b36ae2baa Correctly name functions, remove old code and fix bezier solver 2014-05-25 10:41:24 +02:00
BeaR f3ca79315e Remove unnecessary debug variable 2014-05-24 17:19:27 +02:00
BeaR d5a7590e7c Clamp bezier tangents and re-fix envelope preview 2014-05-24 17:12:39 +02:00
BeaR 09c2e8475f Fix envelope editor scaling 2014-05-24 15:10:48 +02:00
BeaR fe74ff4c0c Fix some numerical issues at bezier envelopes 2014-05-24 12:34:15 +02:00
BeaR 3c99ba5228 Correctly preview the envelope curves 2014-05-23 15:48:37 +02:00
BeaR a39a03e318 Fix envelope preview commit 2014-05-23 12:59:00 +02:00
BeaR f209aea10e Add cubic bezier-FCurves support for envelopes 2014-05-23 11:12:43 +02:00
BeaR 9e5daa446b Add enum for envelope preview modes 2014-05-23 11:12:15 +02:00
oy bb8a180358 Merge pull request #1204 from cinaera/clean_rendertools
Cleanup MapScreenToGroup
2014-05-11 20:00:29 +02:00
oy 68c58d1aae Merge pull request #1148 from ghost91-/menumusic
snd_enable_musicnow controlls menu music.
2014-05-11 17:49:20 +02:00
ghost91- 242ac2233a snd_enable_musicnow controlls menu music.
don't poll on music toggeling
2014-04-16 14:27:53 +02:00
m!nus 92fbebf40a generated files are now in build/ as well
also fixed python invocation on windows again
2014-03-23 11:50:57 +01:00
heinrich5991 c927b73a4c Fix walking animation
Previously, when walking with negative x-coordinate, your walking direction was
inversed.
2014-03-22 11:56:21 +01:00
BeaR 2fcb898f5f Remove redundant MapScreenToGroup() and declarate it in RenderTools 2014-03-11 10:24:37 +01:00