Commit graph

102 commits

Author SHA1 Message Date
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
55b5ce883d Clean up unformatted files 2019-07-08 04:28:31 +02:00
Anders Jenbo
d2cb6a59e7 Apply scrollrt naming to town.cpp 2019-07-05 13:23:48 +02:00
Anders Jenbo
f187fe7d3a Merge branch 'master' of github.com:diasurgical/devilution 2019-06-22 18:14:48 +02:00
Anders Jenbo
d437d48f66 Align scrollrt_draw_dungeon with cliped versions 2019-06-17 21:37:40 +02:00
Anders Jenbo
e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Anders Jenbo
dec73be85e Apply bflags 2019-06-14 02:10:17 +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
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
f1d54cee52 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-23 18:12:54 +02:00
galaxyhaxz
31cbaed01e fix name type 2019-05-22 08:30:59 +01:00
Anders Jenbo
73a29f0e68 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-18 16:55:20 +02:00
galaxyhaxz
6e37114459 Add defs for border pixels 2019-05-16 09:24:56 +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
d61b3e3b63 Clean up scrollrt.cpp 2019-05-02 00:16:46 +01:00
Anders Jenbo
a46ef68b2c Merge branch 'master' of github.com:diasurgical/devilution 2019-04-29 02:29:39 +02:00
galaxyhaxz
f44ef05e5e scrollrt_draw_clipped_dungeon_2 2019-04-28 15:25:56 +02:00
galaxyhaxz
2d2461cc3d scrollrt_draw_clipped_dungeon 2019-04-28 02:20:11 +02:00
Anders Jenbo
2327526a62 Merge branch 'master' of github.com:diasurgical/devilution 2019-04-26 19:22:49 +02:00
galaxyhaxz
029b15f298 Fix type for Dungeon Micros 2019-04-26 03:17:06 +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
65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +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
9fabd3dc8f
Merge pull request #966 from galaxyhaxz/LockBuffer
Rename lock_buf
2019-04-17 11:21:04 +09:00
galaxyhaxz
fd53ad06ba Rename lock_buf 2019-04-16 20:16:35 -05:00
galaxyhaxz
3446e3c9a9 Add defs for screen resolution 2019-04-16 19:43:50 -05:00
Anders Jenbo
c0531bfc4c Some booleans 2019-04-16 02:30:48 +02:00
galaxyhaxz
de73017b11 scroll real time cleanup 2019-04-14 15:47:16 +02:00
Robin Eklind
6d49faba3e StartQuestlog bin exact. Also, fix type of questlog 2019-04-13 14:21:04 +02:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
Robin Eklind
018c81d5aa
Merge pull request #832 from AJenbo/StartGoldDrop
Clean up inv.cpp
2019-04-08 17:10:23 +09:00
Anders Jenbo
e7d5aac5dc Clean up engine and scrollrt attribute naming 2019-04-07 21:17:59 +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
69ad8b63e0 Clean up StartGoldDrop 2019-04-05 16:44:04 +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
8f2495c117
scrollrt_draw_dungeon - WIP (#773) 2019-04-02 11:16:23 -05:00
galaxyhaxz
5238265702
Implement assert support (#791) 2019-03-29 21:26:37 -05:00
galaxyhaxz
5ddb46fabe More Scrollrt cleanups 2019-03-28 01:58:28 -05:00
galaxyhaxz
f5c3ae93d3 Cleanup DrawMain 2019-03-27 17:32:55 +01:00
galaxyhaxz
574dbd1aba Final ASM cleanups 2019-03-27 17:28:18 +01:00
Anders Jenbo
0a142104bc Remove missleading notes 2019-03-27 15:42:45 +01:00
Anders Jenbo
770754f1ab Apply enums to scrollrt and town 2019-03-27 15:36:05 +01:00