Aurailus
/
Zepha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
504 Commits
1 Branch
0 Tags
20 MiB
Commit Graph

504 Commits (ad029752ef5ef4f2e4a24ba8dd13520b51829ab4)

Author SHA1 Message Date
Nicole Collings 3aaf649c42 Refactor bottom bar, dynamically search for subgames. 2019-12-11 21:38:20 -08:00
Nicole Collings 4d10fe826a Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	assets/textures/menu_flag_multiplayer.png
 2019-12-11 14:20:58 -08:00
Nicole Collings 407d35c210 GUIImageButton class 2019-12-11 14:20:40 -08:00
Nicole Collings cede63d461
Merge pull request #14 from Aurailus/imgbot 
[ImgBot] Optimize images
 2019-12-11 00:46:20 -08:00
ImgBotApp 336fa50566
[ImgBot] Optimize images 
*Total -- 4.94kb -> 4.29kb (13.14%)

/assets/textures/menu_flag_settings.png -- 1.26kb -> 0.95kb (24.61%)
/assets/textures/menu_flag_quit.png -- 1.21kb -> 1.04kb (14.16%)
/assets/textures/menu_flag_content.png -- 1.22kb -> 1.12kb (8.31%)
/assets/textures/menu_flag_multiplayer.png -- 1.24kb -> 1.17kb (5.21%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2019-12-11 08:42:37 +00:00
Nicole Collings bac6403425 `crop` texture modifier, UI flag hover textures. 2019-12-11 00:41:46 -08:00
Nicole Collings ebff66f1a7 Replace getTextureRef with operator[],delete Def member access functions 2019-12-10 23:12:29 -08:00
Nicole Collings 0143979e12 Obligatory ascii art introduction 2019-12-10 15:44:58 -08:00
Nicole Collings 79cb99638b Merge remote-tracking branch 'origin/master' 2019-12-10 15:15:10 -08:00
Nicole Collings b4b32520e0 Make server launch with subgame argument, move mods to subgames/zeus 2019-12-10 15:14:59 -08:00
Nicole Collings e100bbdf6e Move mods to subgames/zeus/mods 2019-12-10 14:58:10 -08:00
Nicole Collings cd67d73c25
Merge pull request #13 from Aurailus/imgbot 
[ImgBot] Optimize images
 2019-12-10 14:41:52 -08:00
ImgBotApp 83a6332e9b
[ImgBot] Optimize images 
*Total -- 65.81kb -> 60.60kb (7.92%)

/assets/textures/subgame_flag_settings.png -- 0.78kb -> 0.68kb (12.38%)
/assets/textures/menu_flag_settings.png -- 0.77kb -> 0.68kb (11.04%)
/assets/textures/zeus_background.png -- 60.86kb -> 55.90kb (8.14%)
/assets/textures/menu_flag_quit.png -- 0.72kb -> 0.70kb (2.18%)
/assets/textures/zeus_logo.png -- 2.68kb -> 2.62kb (2.08%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2019-12-10 22:41:15 +00:00
Nicole Collings 3dbe231d0e Merge remote-tracking branch 'origin/master' 2019-12-10 14:40:13 -08:00
Nicole Collings f3e8196275 Add art assets to repo 2019-12-10 14:40:04 -08:00
Nicole Collings 4065fbf8de Title Screen, GUIComponent insert, click events, hover state wip 
* Added getMousePos to Window (should be in InputManager but w/e)
 2019-12-10 14:39:45 -08:00
Nicole Collings 9bea7aac00
Merge pull request #12 from Aurailus/imgbot 
[ImgBot] Optimize images
 2019-12-09 21:24:55 -08:00
ImgBotApp be03c57f0c
[ImgBot] Optimize images 
/mods/default/textures/tallgrass_5.png -- 0.42kb -> 0.41kb (2.12%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2019-12-10 05:19:23 +00:00
Nicole Collings 647a83b1ce Merge remote-tracking branch 'origin/master' 2019-12-09 21:19:09 -08:00
Nicole Collings 851de85e70 Block collision boxes, Add Step-up functionality to Collidable 
* Tweak player speed.
* Make Invalid display.
* Fix some mod bugs.
 2019-12-09 21:19:02 -08:00
Nicole Collings ba7a51b711
Merge pull request #11 from Jordach/master 
Fix Windows build, prevent bad GLM experimental extensions loading
 2019-11-23 17:10:37 -08:00
Jordan Snelling ea2f2ac068 Fix windows build, prevent glm/ext.hpp from 
compiling bad min_max extensions
 2019-11-24 01:05:50 +00:00
Jordan Snelling 0b4515902b Merge remote-tracking branch 'upstream/master' 2019-11-23 22:35:24 +00:00
Nicole Collings 4960942618 Merge remote-tracking branch 'origin/master' 2019-11-23 13:42:57 -08:00
Nicole Collings 21b91a7249 I didn't use pointers for copying 128 1000+ char strings / frame. HELP 
* Fixed like 90% of the generation lag in like 10 lines of code.
 2019-11-23 13:42:46 -08:00
Nicole Collings 8c3cf3ed40 Map Block Integrity 2019-11-23 02:06:37 -08:00
Nicole Collings 8a200ba501
Create Github Actions Workflow 2019-11-22 14:33:48 -08:00
Nicole Collings 07bf603516 Merge remote-tracking branch 'origin/master' 2019-11-22 01:29:21 -08:00
Nicole Collings 19d6c24541 Fixed server bugs, removed unnecessary TODOs. 
- Fixed Server generating excessive MapBlocks.
- Fixed Server not generating when moving.
 2019-11-22 01:29:09 -08:00
Nicole Collings ac56c16c0f Rewrite Dimension to use Regions & MapBlocks again 2019-11-22 01:00:29 -08:00
Nicole Collings d151ada76e Remove old unit tests, write unit tests for Space. 2019-11-22 01:00:10 -08:00
Nicole Collings 49da2ad701 Organized and Optimized TransPos, renamed to Space 
- Clean up VecUtils
 2019-11-22 00:59:55 -08:00
Nicole Collings 54bfd5f5b4 MapGen generates by the MapBlock. More efficient MapGen algorithm. 
* Create parent to Local & Server Dimension to abstract code.
* Improve NoiseSample class.
! Known bug where map doesn't generate when you move.
! Known bug where map will regenerate even if the chunks already exist.
 2019-11-20 15:52:29 -08:00
Nicole Collings fa9616b8ac Improve NoiseSample efficiency, fix Serializer::encodeUShortVec 2019-11-20 13:31:35 -08:00
Jordan Snelling 23a7857c4d Fix serializer byte offsets 2019-11-19 22:23:47 +00:00
Nicole Collings de67d7e9c3
Merge pull request #9 from Jordach/master 
Fix windows build due to GLM Vectors not found
 2019-11-19 13:42:20 -08:00
Jordan Snelling 328bf4f2c8 Fix windows build 2019-11-19 21:41:14 +00:00
Nicole Collings 12c06fa94d Merge remote-tracking branch 'origin/master' 2019-11-19 13:14:33 -08:00
Nicole Collings a21521cc2d Fix missing biomes 2019-11-19 13:14:28 -08:00
Nicole Collings 65b70bb55f
Merge pull request #10 from Aurailus/imgbot 
[ImgBot] Optimize images
 2019-11-18 23:11:25 -08:00
ImgBotApp a5b096f6bd
[ImgBot] Optimize images 
*Total -- 10.25kb -> 8.29kb (19.07%)

/mods/default/textures/grass_world.png -- 3.60kb -> 2.20kb (38.96%)
/mods/default/textures/grass_top.png -- 0.80kb -> 0.49kb (38.24%)
/mods/default/textures/entity/player.png -- 5.21kb -> 4.99kb (4.27%)
/mods/default/textures/grass_floating.png -- 0.63kb -> 0.61kb (3.85%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2019-11-19 07:05:14 +00:00
Nicole Collings af8fb9c5a3 Biome tinting, client side biome data 2019-11-18 23:03:51 -08:00
Nicole Collings 2b753121d7 Voronoi disagram - based biomes. 2019-11-13 20:42:25 -08:00
Nicole Collings 2f9defc215 Create register_biome function, move dump() to base. 2019-11-13 18:55:59 -08:00
Nicole Collings 62ec09e373 Improve dump function, move it to base. 2019-11-12 23:48:44 -08:00
Nicole Collings ab97b92569 3D Voronoi Diagram implementation~ 2019-11-12 19:18:11 -08:00
Nicole Collings 737a7da74f Make Dropped Items zoop into player when theyr're close enough. 
* Set loadfile to nil
 2019-11-12 01:15:06 -08:00
Nicole Collings c14c5f6b74 Merge remote-tracking branch 'origin/master' 2019-11-04 20:26:57 -08:00
Nicole Collings 5831977790 Support text and inventory component types in GameGui. Clean up parsing. 
* GameGUI Support resizing.
* Bind player.close_menu function.
* Remove cShowMenu and cHideMenu
 2019-11-04 20:26:50 -08:00
Nicole Collings 99d43a6f18
Merge pull request #8 from Jordach/master 
Fix Windows build again
 2019-11-04 15:46:33 -08:00