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

212 commits

Author SHA1 Message Date
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
32a51d17ca Align function signatures with PSX symbols 
Using
https://github.com/diasurgical/scalpel/tree/master/psx/_dump_/3/_dump_c_src_/diabpsx/source
as a reference
 2019-07-08 04:12:12 +02:00
Anders Jenbo
4ff5197291 merge devilution 2019-06-28 21:53:52 +02:00
galaxyhaxz
26932a843f Fix min diff in PlrHitMonst (#1281) 2019-06-28 02:41:41 +02:00
Anders Jenbo
e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Duarte Alvim
6a4142fb08 Add gold constants 2019-06-16 02:24:09 +02:00
Anders Jenbo
8cb04b0d9b Merge branch 'master' of github.com:diasurgical/devilution 2019-06-02 19:11:49 +02:00
Manuel K
896933f55e Replace magic number 352 with VIEWPORT_HEIGHT (#1232) 2019-06-02 17:51:33 +01:00
Anders Jenbo
56dcdd669b Clean up DrawChr 2019-05-31 16:03:03 +01:00
Anders Jenbo
ce056b02d8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-30 14:40:33 +02:00
Anders Jenbo
565bb5aa7d Adust dFlag enums 2019-05-29 16:23:08 +01:00
Anders Jenbo
0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
Sergey Semushin
47aee25195 Make Do_Death bin exact. 2019-05-06 23:03:54 +01:00
Anders Jenbo
23e7737c75 Merge branch 'master' of github.com:diasurgical/devilution 
Fixes #92
 2019-05-05 00:27:08 +02:00
Anders Jenbo
9f5af2e6df Clean up player.cpp 2019-05-02 00:16:46 +01:00
Anders Jenbo
66438890aa Clean up spells.cpp 2019-05-02 00:16:46 +01:00
Anders Jenbo
2327526a62 Merge branch 'master' of github.com:diasurgical/devilution 2019-04-26 19:22:49 +02:00
Robin Eklind
bfe060f173
 		Merge pull request #1037 from AJenbo/count 
Correct count
 2019-04-26 18:55:59 +09:00
galaxyhaxz
029b15f298 Fix type for Dungeon Micros 2019-04-26 03:17:06 +02:00
Anders Jenbo
512f858e67 Correct count 2019-04-26 02:34:19 +02:00
Xadhoom
6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
Anders Jenbo
65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +02:00
Anders Jenbo
55a0396f8f Clean up mem_free_dbg style 2019-04-22 13:22:57 +02:00
galaxyhaxz
540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
galaxyhaxz
7b687413b2 Rename InitPlayerLoc 2019-04-07 23:24:08 +02:00
Anders Jenbo
a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00
galaxyhaxz
d879a325e1
 		Fix dTransVal and pLightTbl (#825) 2019-04-02 14:19:28 -05:00
galaxyhaxz
5238265702
 		Implement assert support (#791) 2019-03-29 21:26:37 -05:00
galaxyhaxz
a29c75a3a2
 		Fix a few func/var names (#731) 2019-03-24 05:54:44 -05:00
Xadhoom
ecb242ae62 Merge branch 'master' 2019-03-12 09:36:42 +02:00
Anders Jenbo
3d0cd681df Merge branch 'master' of github.com:diasurgical/devilution 2019-03-12 02:01:16 +01:00
Anders Jenbo
9358465bb5
 		AddMissile bin exact (#621) 
* AddMissile bin exact

* Clean up bools
 2019-03-11 23:59:26 +01:00
Xadhoom
5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00:00
Anders Jenbo
f17e923ab8 Merge branch 'master' of github.com:diasurgical/devilution 2019-03-08 03:12:02 +01:00
Max Desiatov
269aa345bd Fix downstream 64-bit builds 2019-03-08 03:07:21 +01:00
Xadhoom
6bb95a040e Merge upstream branch 'devilution/master' 2019-03-02 16:01:07 +00:00
Anders Jenbo
bc015e9af1 Make _miDelFlag bool 2019-03-02 16:12:03 +01:00
Xadhoom
0210e2ff74 Small fix 2019-02-25 16:38:47 +01:00
Anders Jenbo
e7848c8192 Make debug less spammy 2019-02-24 17:29:37 +01:00
Xadhoom
216f91bf90 Merge upstream branch 'devilution/master' 2019-02-21 10:31:26 +00:00
Anders Jenbo
b5c7026b15
 		Not all animation combinations exists for player animations 
This issue causes the game to look for 126 non existing animations
- Player always drops weapons when dying
- Player can only block if using a shield
 2019-02-20 22:40:03 +01:00
Xadhoom
0ed4423be9 Possible engine bugfix 2019-02-02 11:09:19 +00:00
Xadhoom
fa90e6720a Revert random_ to random and remove extern "C" linkage 2019-01-21 20:39:55 +00:00
Xadhoom
3dd6cf1671 First try, merge compiles, but immediate crash 2019-01-21 09:48:53 +00:00
Anders Jenbo
9b7da61dcf Auto format src 2019-01-13 18:55:59 +01:00
Anders Jenbo
6d5c9619a7 Clean up town_draw_town_all (#544) 
* Clean up town_draw_town_all

* Clean up town_draw_e_flag

* Clean up InitPlayerLoc

* Fix VS 2015 builds

* Clean up gendung_get_dpiece_num_from_coord

* Clean up town_draw_clipped_e_flag

* Clean up town_draw_clipped_e_flag_2

* Remove HIDWORD() as it is now unused
 2019-01-06 01:36:59 +01:00
Anders Jenbo
fd2a45ff9a
 		Engine.cpp (#548) 
* Clean up DiabloAllocPtr

* Clean up mem_free_dbg

* Clean up GetDirection

* Clean up PlayInGameMovie

* 18 directions
 2019-01-03 02:29:31 +01:00
Anders Jenbo
efec32bcd5 Compile files as C (#527) 
* Compile files as C

* Provide fallback for qmemcpy

Enable C compilation for:
Source/gendung.cpp
Source/inv.cpp
Source/minitext.cpp
Source/pack.cpp
 2018-12-30 13:16:11 +01:00
Robin Eklind
e915623726 rename SetCursor to SetCursor_ to avoid collision with windows.h 
Translation done automatically using:
	$ find . -type f -name '*.h' | xargs -I '{}' sar -i "([ \t])(SetCursor)[(]" '${1}${2}_(' '{}'
	$ find . -type f -name '*.h' | xargs -I '{}' sar -i "([ \t])(SetCursor)[(]" '${1}${2}_(' '{}'
 2018-12-30 03:19:10 +01:00