Commit Graph
516 Commits
Author SHA1 Message Date
galaxyhaxz b430ccc8a2 Fix hero deletion in UI 2018-09-21 00:06:45 -05:00
galaxyhaxzandGitHub bcfe1ddba4 Fix bugs in DiabloUI and cleanup (#312) 2018-09-20 20:04:51 -05:00
galaxyhaxzandGitHub c4fffee8df Merge pull request #309 from squidcc/storm_fixes
Fix some storm ordinal names and remove incorrect function declarations
2018-09-20 18:11:44 -05:00
galaxyhaxzandGitHub 081a99776d Merge branch 'nightly' into nightly 2018-09-20 17:11:36 -05:00
galaxyhaxz 1d27aab18c Fix bugs in DiabloUI 2018-09-20 17:01:15 -05:00
galaxyhaxzandGitHub c7c528bb03 DiabloUI.dll now works for single player (#310) 2018-09-20 00:52:01 -05:00
galaxyhaxz 38fe732e52 Fix for newer compilers 2018-09-20 00:15:21 -05:00
galaxyhaxz b6554d440e DiabloUI is now finally working 2018-09-19 23:58:30 -05:00
galaxyhaxzandGitHub 5945c3257e Merge pull request #1 from diasurgical/nightly
Sync with master
2018-09-19 23:49:34 -05:00
Andrew Dunstan 2fe00515b1 Fix some storm ordinal names and remove incorrect function declarations 2018-09-20 14:16:52 +10:00
galaxyhaxzandGitHub 182b2c0216 Merge pull request #308 from diasurgical/master
Sync with master
2018-09-19 19:41:40 -05:00
galaxyhaxzandGitHub 3e0ae36e79 Merge pull request #307 from AJenbo/WeaponDur
Fix WeaponDur
2018-09-19 19:40:54 -05:00
Anders Jenbo 58bae6de18 Fix WeaponDur 2018-09-20 02:37:29 +02:00
galaxyhaxzandGitHub bffb61d36e Merge pull request #306 from galaxyhaxz/nightly
Fix drawing of Hero portrait (UI)
2018-09-19 19:30:02 -05:00
galaxyhaxz 3ab3e21284 Fix drawing of Hero portrait (UI) 2018-09-19 19:25:17 -05:00
galaxyhaxzandGitHub e5c1e000d5 Merge pull request #304 from galaxyhaxz/nightly
Implement "hero list" in DiabloUI
2018-09-19 18:33:18 -05:00
galaxyhaxz 5a7f38d562 Implement "hero list" in DiabloUI 2018-09-19 18:13:12 -05:00
galaxyhaxzandGitHub 097105cecb Merge pull request #303 from diasurgical/nightly
Resync commits
2018-09-19 15:32:30 -05:00
galaxyhaxzandGitHub 42c9076ce5 Sync with nightly (#302) 2018-09-19 14:44:30 -05:00
galaxyhaxzandGitHub 1224d01161 Sync with master (#301) 2018-09-19 14:41:22 -05:00
galaxyhaxzandGitHub 6769eb8baf Implement hero selection in DiabloUI (P1) (#300) 2018-09-19 02:31:15 -05:00
galaxyhaxzandGitHub 91554056bb Implement "credits.cpp" in DiabloUI (#298) 2018-09-18 23:25:48 -05:00
galaxyhaxzandGitHub 7be8253dc9 Implement "mainmenu.cpp" in DiabloUI (#297) 2018-09-18 21:18:03 -05:00
galaxyhaxzandGitHub 2b881e7a09 UI splash screen fix (#296) 2018-09-18 19:42:14 -05:00
Dennis Duda 2f7f7d055e Switched all remaining uses of UINT64 to unsigned __int64 to make it compilable on <=VC5 2018-09-18 23:30:25 +02:00
Dennis Duda 7f98d3c54a Fixed editorconfig to not convert shellscripts to CRLF, changed are-we-d1-yet.sh to LF 2018-09-18 23:20:06 +02:00
Dennis Duda fe96a30411 Only write via discord webhook on nightly pushes 2018-09-18 23:03:12 +02:00
galaxyhaxzandAnders Jenbo 71c2149d46 First "working" version of diabloui.dll ^_^ (#221) 2018-09-18 21:26:25 +02:00
galaxyhaxzandAnders Jenbo 508ed542e4 Implement doom/focus/titlesnd.cpp (#220) 2018-09-18 21:26:23 +02:00
galaxyhaxzandAnders Jenbo cd17ca323d Implement "fade.cpp" in DiabloUI (#219) 2018-09-18 21:26:20 +02:00
galaxyhaxzandAnders Jenbo e7aa782e06 Implement 'artfont.cpp' in DiabloUI (#218) 2018-09-18 21:26:18 +02:00
galaxyhaxzandAnders Jenbo d7b008f585 mainmenu fix (#217) 2018-09-18 21:26:15 +02:00
Anders Jenbo 146cd9fe8c Change UINT64 to __int64 2018-09-18 21:26:08 +02:00
Anders Jenbo c092e9b653 Remove nightly build status 2018-09-18 21:25:49 +02:00
Anders Jenbo b7b01e5a3b Fix EOL 2018-09-18 21:25:32 +02:00
Dennis Duda 78e0cd3e49 Fixed broken merge in Diablo.dsp 2018-09-17 22:50:13 +02:00
Robin EklindandDennis Duda f1f032b4f4 Use BOOL for lightflag and light4flag 2018-09-17 21:49:53 +02:00
Robin EklindandDennis Duda d7d7f79ff8 Cleanup DRLG_Init_Globals 2018-09-17 21:49:53 +02:00
Anders JenboandDennis Duda 91eecec686 WIP PlrHitPlr 2018-09-17 21:37:55 +02:00
Dennis Duda 4e061cb2c9 Minor cleanups to DrawAutomap
Added missing spacing, converted to post-increment where pre-increment isn't needed
2018-09-17 21:16:35 +02:00
Andrew DunstanandDennis Duda f305559161 Clean DrawAutomap 2018-09-17 21:16:35 +02:00
Dennis DudaandGitHub 9cf3a62ca8 Merge pull request #152 from seritools/devilution-merge
Devilution merge
2018-09-17 21:12:33 +02:00
Dennis Duda bf4d5ba5fa Merge remote-tracking branch 'devilution/master' 2018-09-17 21:01:20 +02:00
Dennis Duda 47d217d11d Revert "Revert "Add pre-liminary source code for DiabloUI""
This reverts commit 440113f97c.
2018-09-17 20:59:26 +02:00
Anders JenboandGitHub 4220be365d Merge pull request #145 from AJenbo/StartWarpLvl
Clean up StartWarpLvl
2018-09-17 03:42:39 +02:00
Anders JenboandGitHub 3a37d6e0ea Merge pull request #146 from AJenbo/WeaponDur
Clean up WeaponDur
2018-09-17 03:42:32 +02:00
Anders Jenbo 0b9fcb1b43 Clean up WeaponDur 2018-09-17 03:17:43 +02:00
Anders Jenbo 3fce84c87d Clean up StartWarpLvl 2018-09-17 03:15:35 +02:00
galaxyhaxzandGitHub 48fc4bc4b6 Fix typo and add remaining instructions 2018-09-16 19:05:46 -05:00
galaxyhaxzandGitHub 05b1f90027 Implement Diablo UI code (#206) 0.4 2018-09-16 17:39:31 -05:00