Commit Graph
84 Commits
Author SHA1 Message Date
Anders Jenbo 893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo c1b4d3d8b5 Copy documentation from sanctuary/notes 2020-07-06 05:43:25 +02:00
Anders Jenbo 1ba96a6777 Add doxygen description to remaining engine files 2020-07-06 05:43:25 +02:00
Anders Jenbo 7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo c384711a5f Backport cleanups from hellfire branch 2020-04-08 20:16:32 +02:00
Anders Jenbo 660405505f Remove C compat
It's unmaintained and clear that we won't be going back since some
functions can only be solved with C++
2020-04-06 05:43:20 +02:00
Robin Eklind 21e2d2f9de Resolve CreatePalette name conflict
Fixes #641.
2020-02-26 10:41:10 +01:00
Anders Jenbo bd6eebedb1 Drop storm_dx.cpp 2020-02-15 00:39:51 +01:00
Anders Jenbo 25993b4043 Merge branch 'master' of github.com:diasurgical/devilution 2020-02-14 23:03:31 +01:00
Anders Jenbo 20621a0642 add all.h and use in place of diablo.h (#2005)
Now diablo.h is treated in the same way as all other header files of
Source, as it only contains the declarations of global variables and
functions of diablo.cpp.

Besides consistency, this also enables mods to include diablo.h just
like any other header file without having to include every header file
(and without having to include C++ specific aspects of the now all.h).
2020-02-14 13:12:54 +01:00
Anders Jenbo 32d91cb446 Render menu directly to the output surface
Fixes fades not reset when switching to a new menu before fade had
ended.
Fixes incorrect start position for credits.
2020-02-09 02:33:33 +01:00
Anders Jenbo a9e955578a Correctly apply the red palette when taking screenshots 2020-02-08 23:07:19 +01:00
Anders Jenbo edeca6574d Replace tagRECT with SDL_Rect 2020-02-01 15:43:51 +01:00
Anders Jenbo 40ba1e7a6f Merge branch 'master' of github.com:diasurgical/devilution 2020-02-01 14:48:39 +01:00
Anders Jenbo 913de17a56 Use SDL_Color nativly instead of converting betwen it and PALETTEENTRY 2020-01-31 01:20:10 +01:00
qndel 36d22334ee apply border enums 2020-01-30 04:19:02 +01:00
Anders Jenbo cee06d07a7 Correct spelling of color 2020-01-10 11:13:47 +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