Commit Graph
109 Commits
Author SHA1 Message Date
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 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 a291939a7d Value types 2020-04-06 05:43:20 +02:00
Anders Jenbo 776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
galaxyhaxzandRobin Eklind 71565b9c02 Several updates [enums+names] (#2002)
* Several updates

* Correct msg_get_next_packet

* Update enums.h

Co-Authored-By: Robin Eklind <[email protected]>

Co-authored-by: Robin Eklind <[email protected]>
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 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 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 6597688eac Rename cell functions 2019-10-13 13:31:56 +02:00
Anders Jenbo c5a9917aee Merge branch 'master' of github.com:diasurgical/devilution 2019-09-17 03:29:59 +02:00
Anders Jenbo b22e2451e3 Merge pull request #1618 from qndel/SetReturnLvlPos
SetReturnLvlPos cleanup
2019-09-15 15:42:53 +02:00
qndel eab02de82f ResyncQuests cleanup 2019-09-15 12:48:41 +02:00
qndel 72883c0621 SetReturnLvlPos cleanup 2019-09-15 12:11:54 +02:00
Anders Jenbo 14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
Anders Jenbo 1f715f86f6 Clean up 2019-08-27 17:06:54 +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
Anders Jenbo 2fcf8dab70 Merge branch 'master' of github.com:diasurgical/devilution 2019-07-21 19:39:17 +02:00
Anders Jenbo b023104434 Remove u from values 2019-07-21 00:57:53 +02:00
Anders Jenbo 60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Robin Eklind 4cbf8c9ec3 Rename global pCelBuff to pSPentSpn2Cels
This is to avoid confusion, as pCelBuff is also
commonly used as a parameter name.

The naming follows the convention used by
TextBox2.CEL and TextSlid.CEL, as seen in
stores.cpp

	pSTextBoxCels = LoadFileInMem("Data\\TextBox2.CEL", NULL);
	pSPentSpn2Cels = LoadFileInMem("Data\\PentSpn2.CEL", NULL);
	pSTextSlidCels = LoadFileInMem("Data\\TextSlid.CEL", NULL);
2019-07-16 02:13:16 +02:00
Xadhoom 148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo 7c071924ad Format recently cleaned code 2019-07-06 05:13:01 +02:00
Anders Jenbo 4ff5197291 merge devilution 2019-06-28 21:53:52 +02:00
Joan Karadimov f16bc267fc Use the dungeon_type enum for ReturnLvlT 2019-06-28 11:59:11 +03:00
Anders Jenbo e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Sergey Semushin 81ec719e1b Fix min diff in ResyncQuests. 2019-06-15 01:10:17 +02:00
Anders Jenbo 64e5fa2f05 Apply enums to NetSendCmdQuest 2019-06-07 00:28:10 +02:00
Anders Jenbo 635deebbd4 Apply enums to SpawnQuestItem 2019-06-05 03:15:23 +02:00
Anders Jenbo 0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
galaxyhaxz 82e8d6ed60 Fix trigflag, trigs.cpp bin exact 2019-05-06 23:07:59 +01:00