MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4,948 commits 1 branch 0 tags 51 MiB
Commit graph

137 commits

Author SHA1 Message Date
Anders Jenbo
35c2061ba3 Fix items morphing in Diablo 2021-01-22 22:35:18 +01:00
Anders Jenbo
01590d3757 Merge a section of the Hellfire item and quest code 2021-01-07 02:29:06 +01:00
Anders Jenbo
e609e170d0 Merge a large chunk of Hellfire the code paths 2021-01-06 08:07:20 +01:00
Trihedraf
d5b80cb6e7
 		Add --allquests debug switch for Singleplayer (#959) 2020-12-31 04:34:03 +01:00
Anders Jenbo
61b2d0de95 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-16 02:24:39 +01:00
qndel
7f7ae623df
 		Goe (#2163) 
* proper random_ comparisons
* proper mienemy comparisons
* add mienemy/micaster enum
* GOE enum
 2020-12-04 19:16:58 +01:00
Anders Jenbo
38dbcf7641 Format source 2020-12-02 00:52:38 +01:00
Anders Jenbo
4ae75753c8 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-09 01:24:02 +01:00
qndel
c94c04d049
 		some cleanup (#2146) 2020-11-04 03:33:40 +01:00
Anders Jenbo
330074e840 Clean up menu animation code 2020-10-31 21:41:06 +01:00
Anders Jenbo
72e2637061 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-25 17:38:06 +01:00
Gleb Mazovetskiy
ec329e645c Fix all "no-write-strings" warnings 2020-10-25 15:37:51 +01:00
Anders Jenbo
e073422ce7 Unify executable for Spawn and Retail 
The game will now autodetect if it should run in shareware mode or full
retail based on the found mpq file. Additionally it can beforced in the
shareware mode with --spawn even if the retail data is found.

This simplifies a lot of the spagetty code and lets us better refactor,
also worth noteing is that we won't have to setup a secound set of build
tests.
 2020-10-20 19:42:01 +02:00
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
qndel
b81d2eb831
 		some cleanups (#2099) 2020-10-12 00:42:02 +02:00
Anders Jenbo
7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo
893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Tyler
c803c6aa66 Calculate position of screen elements 2020-09-27 00:21:54 +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
e6e0ebe15a Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-07 03:46:20 +02:00
Anders Jenbo
f1c216e688 Make player struct x/y fields match monster struct 2020-04-07 03:26:38 +02:00
Anders Jenbo
3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
Anders Jenbo
cc0f92d45b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 06:09:30 +02:00
Anders Jenbo
a291939a7d Value types 2020-04-06 05:43:20 +02:00
Anders Jenbo
b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
Anders Jenbo
776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
Anders Jenbo
f7e2283702 Reorder globals 2020-03-12 04:33:58 +01:00
galaxyhaxz
71565b9c02
 		Several updates [enums+names] (#2002) 
* Several updates

* Correct msg_get_next_packet

* Update enums.h

Co-Authored-By: Robin Eklind <mewmew@users.noreply.github.com>

Co-authored-by: Robin Eklind <mewmew@users.noreply.github.com>
 2020-03-11 21:27:40 -05:00
Anders Jenbo
58e3192ef9 Merge branch 'master' of github.com:diasurgical/devilution 
Fixes #620
 2020-02-29 18:18:45 +01:00
galaxyhaxz
81ff8e6287 Metallic hydrogen neural array 2020-02-28 16:35:57 -06: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
2751ecedd2 [hellfire] Add missing enums 2020-01-12 18:04:40 +01:00
Anders Jenbo
9a704ff2f0 Merge branch 'master' of github.com:diasurgical/devilution 2019-12-19 01:05:01 +01:00
Anders Jenbo
5fa0c5781b Backport cleanups from Hellfire branch 2019-12-15 06:14:57 +01:00
Anders Jenbo
85ab626437 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-15 02:22:17 +01:00
Anders Jenbo
b3d1283844
 		Enum for Lazarus stairs 2019-12-07 01:45:52 +01:00
Anders Jenbo
af0a7c0653 Apply SPANEL_WIDTH 2019-11-10 22:35:17 +01:00
Anders Jenbo
4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
Anders Jenbo
2348c3a8fd Documentations, enums and clean ups 2019-10-21 19:33:14 +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
d354bd9767 Lock framerate at vsync instead of 20fps 
Since most animations are still controlled by the game logic the only
real benefit is smoother mouse and scrolling text, but it's a start :)
 2019-10-20 15:59:47 +02:00
Anders Jenbo
337bc9b125 Render text in screen cordinates instead of buffer offsets 2019-10-20 15:59:47 +02:00
Anders Jenbo
40cb1c01f0 Calcualte SStringY instead of using a prebaked table 2019-10-20 15:59:47 +02:00
Anders Jenbo
ad7a621e5f Drop PitchTbl to avoid resolution restriction 2019-10-20 15:59:47 +02:00
Anders Jenbo
a0baa92ef0 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-13 19:59:26 +02:00
Anders Jenbo
0502ba70ea Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-10-13 18:53:49 +02:00