6009aa17f1
Merge branch 'dev' into shops
...
Conflicts:
src/artifact.c
2019-03-06 22:30:17 +01:00
9b4a7b6cfc
Removes crazy old bug that never presented itself before
...
This isn't an issue with the current release because destruction of
objects and artifact objects is identical. Only became an issue now that
the artifact struct and destruction is chaning.
2019-03-06 22:28:13 +01:00
63812fbe05
More wall layouts and cordinated walls
2019-03-06 18:21:27 +01:00
c6a022e2db
Moved text sprite logic to sprite_util
2019-03-04 20:32:09 +01:00
06ca6c3e1e
Not finnished yet, commit
2019-03-04 18:06:46 +01:00
bab5fd7980
Merge branch 'dev' into shops
2019-03-04 16:06:58 +01:00
68f44090ed
Add amt sprite to all items where value != 0
2019-03-04 16:06:13 +01:00
959fae1730
Add value sprite to items.
...
Completely untested
2019-03-04 15:00:35 +01:00
ca41520c06
Wall layouts added to regular build
2019-03-04 13:13:58 +01:00
88f4703d00
Some more fence layouts
2019-03-04 13:05:23 +01:00
486c1bb641
Merge branch 'dev' into shops
2019-03-04 12:52:20 +01:00
206f95f3b6
Fences and walls in layout files
2019-03-04 10:09:55 +01:00
1c4e600dd4
Wall layout data
2019-03-04 07:35:26 +01:00
57a16888b8
Merge branch 'dev' into shops
2019-03-01 12:44:49 +01:00
13ca11c70e
Begins refactoring of layout parser to accomodate more layout details
2019-03-01 12:44:12 +01:00
33efba87b5
Merge branch 'dev' into shops
2019-03-01 08:58:33 +01:00
5d61a91139
Split pit layout logic into separate file
...
The plan is to extend this further to incorporate walls and stuff.
This can later be used for the shop layout.
2019-03-01 08:57:15 +01:00
6542e4f1d0
Moves item update to its own function
2019-02-28 21:53:30 +01:00
7b47c6a6bf
Completes buyable items
2019-02-28 20:37:19 +01:00
16d9035941
Merge branch 'dev' into shops
2019-02-28 19:41:30 +01:00
4054c37caa
Ignore vscode_build dir
2019-02-28 19:41:07 +01:00
ad227f1bed
A start to "priced" items
2019-02-28 13:49:15 +01:00
37ba189e54
Suppress cppcheck issues
2019-02-28 13:31:56 +01:00
645a02c99e
Ignore .vscode folder
2019-02-27 10:40:43 +01:00
35b5d7a8c1
Patch version raised to 4
2019-02-26 17:52:24 +01:00
c3464eb37d
Fixes a typo
2019-02-26 17:51:46 +01:00
fe18240060
Patch version raised to 3
2019-02-26 17:30:15 +01:00
e4555237ed
Update README.md
...
Codefactor badge change
2019-02-26 12:02:32 +01:00
791dd7ecfd
Removes cppcheck warning
2019-02-26 12:02:04 +01:00
b08ef10e82
Code maintenance and cleanup
2019-02-26 11:59:07 +01:00
fffcac12c0
Makes sure til effects and items apply after backstab
2019-02-24 23:33:08 +01:00
1b440c248d
Patch version raised to 2
2019-02-24 23:02:08 +01:00
a03aec7c46
Handles the second mingw special case which I kept forgetting.
...
Because I'm an idiot
2019-02-24 22:48:03 +01:00
0de018f3be
Fix mingw preprocessor define from cmake
2019-02-24 22:42:51 +01:00
3eeb4d05a9
Include mingw32 64bit in the exclusion
2019-02-24 22:37:45 +01:00
5f369da4e1
Fixed preprocessor command for mingw
2019-02-24 22:34:20 +01:00
c98e6e6d05
Fix wonky mingw errors in appveyor
2019-02-24 22:31:32 +01:00
499f015db9
Only use gmtime_s for MSVC
2019-02-24 20:05:23 +01:00
9b9a0ca2a0
Fixed bad include
2019-02-24 20:01:06 +01:00
926054b116
Ensure that we have seed when making a map
2019-02-24 19:57:33 +01:00
49b7ebb923
Include patch notes for v2.2.1
2019-02-24 19:48:40 +01:00
ee4dd273b9
Patch version raised to 1
2019-02-24 19:46:18 +01:00
5ee20c9c20
Shifted to safer time functions and utc time
2019-02-24 19:43:41 +01:00
563ebf9204
Adds another build fix
2019-02-22 00:38:39 +01:00
3533d5ca58
Fixes build again
2019-02-22 00:36:10 +01:00
97b097af41
Fixes builds
2019-02-22 00:34:56 +01:00
685bf97467
Makes the custom random generator deterministic across platforms
...
TIL that the generators are implemented according to spec but the
distributions are custom. Since this is C I think we can manage without
distributions.
This still needs a test.
2019-02-22 00:27:19 +01:00
cc375bba4e
Implements control over lua random numbers
2019-02-22 00:09:31 +01:00
1205856d00
Attempt att syncing random generation
...
The default rand() and srand() differ between msvc and gcc.
Attempting to fix this by implementing a custom C++ library.
2019-02-21 20:57:38 +01:00
d1efa8450d
Create new leaderboards with attribute 'Descending'
2019-02-20 20:18:52 +01:00
Linus Probert