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

320 commits

Author SHA1 Message Date
Anders Jenbo
4794c8357c Merge branch 'master' of github.com:diasurgical/devilution 2020-11-02 03:59:47 +01:00
Anders Jenbo
086cdf6afe Re order control.cpp 2020-11-02 02:36:48 +01:00
Anders Jenbo
330074e840 Clean up menu animation code 2020-10-31 21:41:06 +01:00
Anders Jenbo
72e2637061 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-25 17:38:06 +01:00
Gleb Mazovetskiy
ec329e645c Fix all "no-write-strings" warnings 2020-10-25 15:37:51 +01:00
Anders Jenbo
e073422ce7 Unify executable for Spawn and Retail 
The game will now autodetect if it should run in shareware mode or full
retail based on the found mpq file. Additionally it can beforced in the
shareware mode with --spawn even if the retail data is found.

This simplifies a lot of the spagetty code and lets us better refactor,
also worth noteing is that we won't have to setup a secound set of build
tests.
 2020-10-20 19:42:01 +02:00
Anders Jenbo
cec9579186 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:48:34 +02:00
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
Anders Jenbo
02ddab6a31
 		Apply SPLICONLENGTH 2020-10-12 09:08:42 +02:00
qndel
ed11e3bde5 [hellfire] DrawSpellList bin exact 2020-10-12 06:54:05 +02:00
qndel
5d7eeddcc9 [hellfire] DrawChr bin exact 2020-10-12 05:28:23 +02:00
Anders Jenbo
7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo
f1a193e1e2 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-11 07:01:25 +02:00
qndel
fb8955dd5c control_print_talk_msg cleanup 2020-10-10 14:52:45 +02:00
qndel
a78d532e2c DrawGoldSplit cleanup 2020-10-10 14:52:16 +02:00
qndel
af76de2563 CheckSBook cleanup 2020-10-10 14:51:39 +02:00
qndel
f5ab247c42 CheckChrBtns cleanup 2020-10-10 14:51:05 +02:00
qndel
703ec92566 control_check_btn_press cleanup 2020-10-10 14:50:18 +02:00
qndel
0ef6d9e97b DoPanBtn cleanup 2020-10-10 01:13:50 +02:00
qndel
f0f33571a6 DoSpeedBook cleanup 2020-10-10 00:53:56 +02:00
qndel
1e5554ec6f DrawChr cleanup 2020-10-09 12:42:03 +02:00
Anders Jenbo
cd6842a110 Merge branch 'master' of github.com:diasurgical/devilution 2020-09-28 15:41:00 +02:00
Anders Jenbo
76f63c9202
 		Fix icon offset 2020-09-28 15:37:31 +02:00
Anders Jenbo
c53ca1a62a Adjust resolution to monitor default on startup 2020-09-28 07:03:22 +02:00
Anders Jenbo
f5647c4788 Merge branch 'master' of github.com:diasurgical/devilution 2020-09-28 02:11:28 +02:00
Anders Jenbo
c2d54ad39e Decompose number 2020-09-28 02:03:40 +02:00
Anders Jenbo
2a3db5f316 Clean up DrawDurIcon 2020-09-28 01:51:51 +02:00
Anders Jenbo
29efef6987
 		Decompose cords in control_print_talk_msg() 2020-09-27 16:19:57 +02:00
Anders Jenbo
cc09635b71
 		Calculate x posistion of PrintSBookStr 2020-09-27 15:43:43 +02:00
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
dc8be6c0ab
 		C++03 compatibility (#736) 
* Use C++03 compatible constructors
* Remove conflicting definitions
 2020-05-17 01:37:19 +02:00
Anders Jenbo
659dc41aa5 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-26 22:10:34 +02:00
Anders Jenbo
3227fea5c0 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-26 21:44:34 +02:00
qndel
b0a8a38462 clean magic numbers 2020-04-26 19:49:05 +02:00
Anders Jenbo
7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo
630655d9e4 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-08 21:58:34 +02:00
Anders Jenbo
edcd92e012 Misc clean ups that missed last round 2020-04-08 21:47:32 +02:00
Anders Jenbo
c3cdc1c4ab Decompose magic numbers 2020-04-08 20:34:31 +02:00
Anders Jenbo
6704657e71 Apply sematic codestyle 2020-04-08 20:34:29 +02:00
Anders Jenbo
7db4ed749a Apply more enums, defines and types 2020-04-08 20:18:11 +02:00
Anders Jenbo
c384711a5f Backport cleanups from hellfire branch 2020-04-08 20:16:32 +02:00
Anders Jenbo
684d6b73f8 Correct ifdef 2020-04-08 14:30:28 +02:00
Anders Jenbo
3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
Anders Jenbo
3f11876aba Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 10:48:11 +02:00
qndel
29682a296e fix pushed in buttons 2020-04-06 08:26:13 +02:00
qndel
5191237f42
 		enums and stuff (#2024) 2020-04-06 08:04:14 +02:00
Anders Jenbo
cc0f92d45b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 06:09:30 +02:00
Anders Jenbo
53ccf38a8c Bool types 2020-04-06 05:43:20 +02:00
Anders Jenbo
31181b77c4 Bool comparisons 2020-04-06 05:43:20 +02:00