Austin (SonosFuer)
|
f04152e65e
|
Merge pull request #283 from GentenStudios/fix-winderps
fix windows builds (austin's code)
|
2020-08-19 16:21:32 -07:00 |
|
Austin (SonosFuer)
|
73fb80e37f
|
Merge branch 'develop' into fix-winderps
|
2020-08-19 16:11:21 -07:00 |
|
Austin (SonosFuer)
|
3ed421ecbf
|
Merge pull request #280 from GentenStudios/feat-meshing
Fix Meshing + Crashes throughout develop.
|
2020-08-19 16:06:41 -07:00 |
Vyom Fadia
|
3d0a5ca8e0
|
Merge pull request #282 from JosiahWI/feat-build_revision
Merge changes to top level CMakeLists.txt
|
2020-08-19 22:55:50 +01:00 |
Josiah VanderZee
|
7521e5d129
|
Remove -D UPDATE_SUBMODULES option from CMake build in CI, because it's redundant.
|
2020-08-19 16:44:28 -05:00 |
|
Josiah VanderZee
|
dd0c40fd1c
|
Revert "Remove spaces between options and values for CMake build configuration in CI."
This reverts commit 544ad645d4.
|
2020-08-19 16:37:58 -05:00 |
|
Josiah VanderZee
|
544ad645d4
|
Remove spaces between options and values for CMake build configuration in CI.
|
2020-08-19 16:36:20 -05:00 |
|
Josiah VanderZee
|
b6cc05f34f
|
Set CMake minimum version to 3.12; remove version range.
|
2020-08-19 16:17:41 -05:00 |
|
Josiah VanderZee
|
914150c0c7
|
Fix command for Windows CMake build in CI.
|
2020-08-19 16:16:35 -05:00 |
|
Josiah VanderZee
|
0dc1d5ca20
|
Update CI to let CMake handle git submodules on Windows and MacOS.
|
2020-08-19 16:04:25 -05:00 |
|
Josiah VanderZee
|
e34d51bc3f
|
Print out better status message when CMake is not updating git submodules.
|
2020-08-19 15:55:45 -05:00 |
Timothy VanderZee
|
5254a96eea
|
Update CI to let CMake clone submodules.
|
2020-08-19 15:48:54 -05:00 |
|
Vyom Fadia
|
429ed22f2e
|
Merge branch 'develop' into fix-winderps
|
2020-08-19 20:21:22 +01:00 |
JosiahWI
|
874f64bb34
|
Update CMakeLists.txt
Correct Phoenix version number.
|
2020-08-19 08:22:06 -05:00 |
|
Josiah VanderZee
|
61dde8f4d4
|
Update git submodules from build, and tidy up top level CMakeLists.
|
2020-08-19 07:15:42 -05:00 |
|
Vyom Fadia
|
41d263c444
|
Merge develop and solve conflicts.
|
2020-08-19 12:57:16 +01:00 |
|
Vyom Fadia
|
b789b1a9ce
|
Change somethjing that crossed my mind.
|
2020-08-19 12:42:22 +01:00 |
|
Josiah VanderZee
|
24bd42f3e9
|
Add CMake version check to set policies.
|
2020-08-18 22:03:15 -05:00 |
|
Austin (SonosFuer)
|
7a7c41fc39
|
Add phx namespace for Winderps
|
2020-08-17 20:26:04 -07:00 |
|
austin
|
64487223ad
|
Windows doesn't check capitalization :(
|
2020-08-16 10:43:52 -07:00 |
|
Vyom Fadia
|
1543ab83fa
|
Get selection box rendering.
|
2020-08-14 00:02:53 +01:00 |
|
Vyom Fadia
|
79c7c66f16
|
Fix a ton of stuff, still have to get the selection box working.
|
2020-08-14 00:00:33 +01:00 |
|
Vyom Fadia
|
78b7776f9b
|
Merge pull request #276 from GentenStudios/feat-client-flow
Improve Serializer syntax.
|
2020-08-11 13:18:19 +01:00 |
|
Vyom Fadia
|
24d7306219
|
Merge pull request #278 from apachano/fix-saves
Remove outdated save template in favor of default creation.
|
2020-08-10 01:38:51 +01:00 |
|
austin
|
1aedd5e4c2
|
Fix spacing
|
2020-08-09 16:27:45 -07:00 |
|
Austin (SonosFuer)
|
08ffa41e09
|
Merge pull request #275 from GentenStudios/feat-replace-imgui-function-pointer
Reimplement Chat functionality with a few more features.
|
2020-08-09 16:25:41 -07:00 |
|
Vyom Fadia
|
39d2b6f361
|
Fix mac build issue.
|
2020-08-09 15:10:21 +01:00 |
|
Vyom Fadia
|
a6c8f3e700
|
Fix build issue.
|
2020-08-09 00:25:11 +01:00 |
|
Vyom Fadia
|
ff60ce700b
|
Merge branch 'feat-replace-imgui-function-pointer' of github.com:GentenStudios/Phoenix into feat-client-flow
|
2020-08-09 00:23:04 +01:00 |
|
Vyom Fadia
|
fcc41bb407
|
Merge branch 'develop' of github.com:GentenStudios/Phoenix into feat-client-flow
|
2020-08-09 00:22:48 +01:00 |
|
Vyom Fadia
|
8d27e3834e
|
Documentation.
|
2020-08-09 00:17:02 +01:00 |
|
Vyom Fadia
|
ede712c4a7
|
Address review, fix mesher crash and fix annoying bug where the Rectangle can't tell whether an object is in the rectangle or not...
|
2020-08-09 00:04:52 +01:00 |
|
austin
|
1348de13f1
|
Update Server to use new save system
|
2020-08-08 12:37:50 -07:00 |
|
austin
|
79cf1abf6a
|
Remove outdated save template in favor of default creation.
Update saves system to create entire path if Saves folder is absent
|
2020-08-08 12:07:04 -07:00 |
|
Vyom Fadia
|
816e002ce6
|
Merge branch 'develop' into feat-replace-imgui-function-pointer
|
2020-08-08 18:45:26 +01:00 |
|
Vyom Fadia
|
b952720a97
|
Fix build issue, dunno how i didn't catch this.
|
2020-08-07 17:44:41 +01:00 |
Toby plowy (Toby109tt)
|
bb679f02d9
|
Merge pull request #273 from GentenStudios/feat-registries
Refactor the registries to contain data relevant to the target.
|
2020-08-07 18:20:12 +02:00 |
|
Vyom Fadia
|
8a905c4f7e
|
Documentation.
|
2020-08-07 16:24:11 +01:00 |
|
Vyom Fadia
|
12eee4ae9f
|
Improve Serializer syntax.
|
2020-08-07 16:06:20 +01:00 |
|
Vyom Fadia
|
d903f04687
|
Merge branch 'feat-replace-imgui-function-pointer' into feat-client-flow
|
2020-08-05 17:03:44 +01:00 |
|
Vyom Fadia
|
1a21b9f122
|
Implement chatbox in Network + Client.
|
2020-08-05 16:54:21 +01:00 |
|
Vyom Fadia
|
98209002ec
|
Implement functional chat.
|
2020-08-05 12:01:16 +01:00 |
|
Vyom Fadia
|
139e9a3f86
|
Merge pull request #274 from GentenStudios/fix-crash
Fix the crash in develop.
|
2020-08-02 15:45:37 +01:00 |
|
Vyom Fadia
|
c4362d9d7e
|
Fix the crash.
|
2020-07-31 17:05:33 +01:00 |
|
Vyom Fadia
|
8d2f2f59ef
|
Remove block registry and replace with non-singleton variants that contain data relevant to the target (server + client need different data.)
|
2020-07-31 16:45:20 +01:00 |
Alexandre Plateau
|
1dbcf03cae
|
Merge pull request #270 from GentenStudios/fix-audio-warning
Fix annoying warning with audio system.
|
2020-07-26 20:28:05 +02:00 |
|
Austin (SonosFuer)
|
6ea109e0be
|
Merge pull request #271 from GentenStudios/fix-redundant-save-code
Remove redundant struct and search through saves in new save system.
|
2020-07-26 09:23:49 -07:00 |
|
Austin (SonosFuer)
|
7e70ec1e96
|
Merge pull request #272 from GentenStudios/fix-cmake
Add missing file to cmake.
|
2020-07-26 09:21:33 -07:00 |
|
Vyom Fadia
|
0ffe4a941b
|
Add missing file to cmake.
|
2020-07-26 12:35:50 +01:00 |
|
Vyom Fadia
|
e4ecfe693a
|
Remove redundant struct and search through saves in new save system.
|
2020-07-26 12:27:34 +01:00 |