Commit Graph
68 Commits
Author SHA1 Message Date
qndel 36d22334ee apply border enums 2020-01-30 04:19:02 +01:00
Anders Jenbo da03bae69d Merge branch 'master' of github.com:diasurgical/devilution 2019-12-25 20:38:25 +01:00
Anders Jenbo 0c90ad0527 Set bool values TRUE/FALSE 2019-12-22 23:57:10 +01:00
Anders Jenbo bcd25c8b69 Fix buid for Clang and MSVC from last merge (SetFadeLevel) 2019-11-17 23:18:10 +01:00
Anders Jenbo 7092f54412 Fix buid for Clang and MSVC from last merge 2019-11-17 23:14:38 +01:00
Anders Jenbo c86ab3bed3 Merge branch 'master' of github.com:diasurgical/devilution 2019-11-17 21:46:59 +01:00
Anders Jenbo c3072c9373 Correct fade delay
(256 / 8) × (1000 / 60) / 256 = ms per level (8 levels per frame at
60hz, 256 levels)
2019-11-17 04:02:01 +01:00
Anders Jenbo 0127478673 Improve frame delay for non-v-synced rendering
Thanks to @glebm for pointing out the issue, hopfuly this is a better
solution :)
2019-11-17 03:28:47 +01:00
Anders Jenbo aa23194591 Calculate fade based on frame level time
This makes the frame lenght FPS independant and fixes #459
2019-11-14 00:37:32 +01:00
galaxyhaxz 5f941e862e Fix function order [palette.cpp] 2019-11-11 03:19:27 +01:00
Anders Jenbo 320605d7ec Save gamma on change 2019-11-09 16:55:39 +01:00
qndel 3920bf2678 apply gamma change to HUD on 640x480 2019-11-06 20:30:51 +01:00
Anders Jenbo 4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
Anders Jenbo 0e578ffb11 Enable assertions 2019-10-22 19:04:55 +02:00
Robin Eklind e155a9423e rename random to random_ to avoid collision with random in stdlib.h
Fixes #1813.
2019-10-21 09:56:36 +02:00
Anders Jenbo 73a7a1ae6d Remove unimplemented functions that aren't needed with SDL 2019-10-08 23:04:39 +02:00
Anders Jenbo ba9288c6cf Unify error dialogs, for looks and portability
- Use UiOkDialog() to display all error messages
- Add SDL simple message, and console fallbacks to UiOkDialog()
- Boot graphics early on to facilitate most error messages with build in
gui
- Some more miniwin clean ups
2019-10-06 01:27:11 +02:00
Anders Jenbo 88813c4042 Strip some now unused parts of miniwin and windows api 2019-09-25 01:18:42 +02:00
Anders Jenbo 14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
Anders Jenbo 9daea5be8a Back port clean ups from Hellfire 2019-09-03 00:27:42 +02:00
Anders Jenbo 288f31a1f1 Clean up unused code 2019-08-27 02:41:44 +02:00
Anders Jenbo 1ebf8fe27d Remove unused fallbacks 2019-08-26 14:05:04 +02:00
Anders Jenbo 98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Anders Jenbo 68d51e7d27 Implementing Spawned Shareware version 2019-08-12 16:04:20 +02:00
Alex Yatskov f1da6e6a38 Fix invalid file and line constants (#222)
* Fix invalid file and line constants

* add macros

* remove ASSERT_FAIL macro
2019-08-07 15:49:20 +02:00
Anders Jenbo 23e7737c75 Merge branch 'master' of github.com:diasurgical/devilution
Fixes #92
2019-05-05 00:27:08 +02:00
Anders Jenbo 082e610394 Clean up palette.cpp 2019-05-02 00:16:46 +01:00
Anders Jenbo 897c090338 Merge dx.cpp 2019-04-25 23:50:42 +02:00
Xadhoom 6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
galaxyhaxz 792fc65bea Add support for 32-bit colors (#1018) 2019-04-25 02:39:24 -05:00
Anders Jenbo 9a1d4be89b Merge branch 'merge' of github.com:diasurgical/devilutionX 2019-04-25 02:17:29 +02:00
Anders Jenbo 28dca419c5 Workaround for flickering mouse in caves
Fixes #7
2019-04-25 01:32:19 +02:00
Anders Jenbo 65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +02:00
galaxyhaxz 540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
qndel 9daa04c4d9 Merge pull request #893 from mewpull/LoadGamma
LoadGamma bin exact
2019-04-11 11:53:16 +02:00
Robin Eklind 5f45d06e38 Cleanup palette_update_quest_palette, already bin exact 2019-04-11 01:59:24 +02:00
Robin Eklind e614b566c2 Cleanup PaletteFadeIn and PaletteFadeOut, already bin exact 2019-04-11 01:58:51 +02:00
Robin Eklind 634cf9adfe Cleanup palette_update, already bin exact 2019-04-11 01:56:58 +02:00
Robin Eklind e1a0354a3b Cleanup palette_init, already bin exact 2019-04-10 16:45:20 +02:00
Robin Eklind 2877511e96 palette_set_color_cycling bin exact
Fixes #271.
2019-04-10 16:29:57 +02:00
Robin Eklind ba6a031aa3 LoadGamma bin exact 2019-04-10 19:42:15 +09:00
Robin Eklind 68e6d35bdc Merge pull request #883 from AJenbo/LoadSysPal
Clean up LoadSysPal
2019-04-10 12:05:31 +09:00
Robin Eklind 3820842e1b Merge pull request #884 from AJenbo/SetFadeLevel
Clean up SetFadeLevel
2019-04-10 12:04:58 +09:00
Anders Jenbo e1002b0dff Clean up SetFadeLevel 2019-04-09 21:46:42 +02:00
Anders Jenbo 56e839e2f8 Clean up LoadSysPal 2019-04-09 21:36:51 +02:00
Anders Jenbo b253648c5a Clean up diablo_color_cyc_logic and palette_get_colour_cycling (#868) 2019-04-09 20:32:07 +02:00
galaxyhaxz 4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
Anders Jenbo d8bb37349e Merge branch 'master' of github.com:diasurgical/devilution 2019-04-06 04:34:49 +02:00
Anders Jenbo d2174e3454 Apply code style 2019-04-05 21:54:45 +02:00
Anders Jenbo a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00