Commit graph

119 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
7c071924ad Format recently cleaned code 2019-07-06 05:13:01 +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
0022702c38 Clean up CalcPlrInv calls 2019-06-09 19:42:10 +02:00
Manuel K
97c1edd3a0 Use BUFFER_WIDTH 2019-06-05 20:13:34 +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
6439861554 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-26 14:59:30 +02:00
Sergey Semushin
85a7151d37 Fix min diff in SpecialAutoPlace. 2019-05-26 13:51:28 +01:00
Sergey Semushin
ccc72fda2e Fix min diff in UseInvItem. 2019-05-24 10:21:37 +01:00
Anders Jenbo
f1d54cee52 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-23 18:12:54 +02:00
Sergey Semushin
a549d5ebc4 Clean up CheckInvPaste (bin exact) (#1205) 2019-05-23 17:07:14 +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
46d96eacad Clean up objects.cpp 2019-05-02 00:16:46 +01:00
Anders Jenbo
35b6b738af Merge branch 'master' of github.com:diasurgical/devilution 2019-05-01 15:17:36 +02:00
galaxyhaxz
167a6aae4e Fix StartGoldDrop 2019-05-01 10:38:41 +01: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
777c517b8e Change ASM macro 2019-04-22 02:23:12 -05:00
galaxyhaxz
540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
galaxyhaxz
740e91e881 rename screen_y_times_768 2019-04-19 04:05:55 +02:00
Robin Eklind
1ae8490f98
Merge pull request #969 from diasurgical/UseInvItem
Clean up UseInvItem
2019-04-18 12:54:19 +09:00
Anders Jenbo
190106c8c5 Clean up CheckInvHLight 2019-04-18 03:19:46 +02:00
Anders Jenbo
bd12c6cce9 Clean up UseInvItem 2019-04-18 03:08:13 +02:00
Anders Jenbo
4a99a4a25b Clean up SyncPutItem 2019-04-17 16:22:13 +02:00
Anders Jenbo
1dc7f98d6d Clean up AutoGetItem 2019-04-16 02:30:48 +02:00
Anders Jenbo
c0531bfc4c Some booleans 2019-04-16 02:30:48 +02:00
Anders Jenbo
26737a1594
Clean up StoreAutoPlace (#956) 2019-04-15 19:05:23 +02:00
Robin Eklind
35a1dd2386
Merge pull request #951 from AJenbo/SpecialAutoPlace
Clean up SpecialAutoPlace
2019-04-16 01:37:07 +09:00
Anders Jenbo
051af2cacc Clean up InvPutItem 2019-04-14 03:04:06 +02:00
Anders Jenbo
310744866c Clean up SpecialAutoPlace 2019-04-14 01:11:22 +02:00
Robin Eklind
795d6b6abb
Merge pull request #949 from AJenbo/InvPutItem
Climbing mount improbable
2019-04-14 02:31:51 +09:00
Anders Jenbo
a8cea69923 Clean up InvPutItem 2019-04-13 19:09:15 +02:00
Robin Eklind
c49a226d8b
Merge pull request #926 from AJenbo/GoldAutoPlace
Clean up GoldAutoPlace
2019-04-13 12:35:59 +09:00
Anders Jenbo
c0085bdb95 Clean up GoldAutoPlace 2019-04-12 22:57:02 +02:00
Robin Eklind
3e09e6d70e AutoPlace bin exact (#924) 2019-04-12 20:02:39 +02:00
Anders Jenbo
e7a3109f17 apply enum to ICLASS 2019-04-12 12:08:29 +02:00
Anders Jenbo
8d7cb9e2fe Clean up WeaponAutoPlace 2019-04-12 02:16:55 +02:00
Anders Jenbo
11d625cf5a Clean up InvGetItem 2019-04-11 21:18:03 +02:00
Anders Jenbo
e705511d22 Clean up WeaponAutoPlace 2019-04-11 21:12:03 +02:00
Anders Jenbo
abacbb485c Clean up SwapItem 2019-04-11 20:18:37 +02:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
Anders Jenbo
c45de01c3f
Document bug 2019-04-06 04:58:07 +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
00e6cadf87 Clean up CalculateGold 2019-04-05 20:30:38 +02:00
Anders Jenbo
0fb90dee17 Clean up DropItemBeforeTrig 2019-04-05 20:23:04 +02:00