Commit Graph
100 Commits
Author SHA1 Message Date
StevenRS11 b947154b2d Minecraft is stupid 2014-01-20 02:23:24 -05:00
StevenRS11 b788458c4f Merge pull request #128 from SenseiKiwi/master
Various Updates
2014-01-19 22:32:34 -08:00
StevenRS11 ad1f928db0 fixed gold Dim door not getting corners sometimes 2014-01-20 01:03:31 -05:00
StevenRS11 9fe071368e Working on rift remover strangeness 2014-01-19 22:15:12 -05:00
StevenRS11 8b108688f1 Clear status effects when entering limbo 2014-01-19 03:21:34 -05:00
StevenRS11 439c13cc9f Merge branch 'master' of https://github.com/StevenRS11/DimDoors 2014-01-19 03:15:19 -05:00
StevenRS11 9aa9651a6d Fixed client dimData, link color, and nether doors 2014-01-19 03:15:07 -05:00
StevenRS11 3026432895 Merge pull request #127 from SenseiKiwi/master
Various Fixes
2014-01-18 22:07:38 -08:00
StevenRS11 ea2be9b803 Merging SenseiKiwi's merger 2014-01-19 00:59:24 -05:00
StevenRS11 80d828c252 Lots of fixes.
I also played around with fluids, and added something thats for BR. Its
not permanent here.
2014-01-18 18:35:11 -05:00
StevenRS11 0fcf02e75f Gateways nearly done, added sandstone gateways 2014-01-15 16:29:47 -05:00
StevenRS11 21267309a1 Cleaned up a bit 2014-01-14 18:54:30 -05:00
StevenRS11 0e4e36c454 Gateway generation now emulates old functionality 2014-01-14 13:40:27 -05:00
StevenRS11 9f00345065 Schematics give a new crash now. 2014-01-13 23:13:16 -05:00
StevenRS11 5f7d4ce971 More changes 2014-01-13 20:42:43 -05:00
StevenRS11 7dadef953d more work on gateways, plus tried to add a pack.
Gateway is generating, finally, but it has some... issues. Inquire
within.

Just generate a new world, and use an unstable door to warp to the first
that gens.
2014-01-13 17:49:13 -05:00
StevenRS11 1104961c54 added support for different dungeon gateways 2014-01-11 22:25:00 -05:00
StevenRS11 73e3753d3b Merge pull request #125 from SenseiKiwi/master
More Dungeons
2014-01-09 14:28:45 -08:00
StevenRS11 3369352143 Small fix
Made doors not continually crash servers, now they close if something
breaks.
2014-01-09 13:25:14 -05:00
StevenRS11 6a0cf4706a Merge pull request #124 from SenseiKiwi/master
Various Fixes
2014-01-05 20:16:28 -08:00
StevenRS11 92801f1346 Merge pull request #123 from SenseiKiwi/master
Merged in Mazes and Nether Branches
2014-01-03 23:42:05 -08:00
StevenRS11 ab5ce1e652 Merge pull request #122 from StevenRS11/mazes
I derped. Oh well.
2014-01-03 23:15:16 -08:00
StevenRS11 7d3c429c96 Create Experimental 2014-01-03 01:28:00 -06:00
StevenRS11 d71e28bbcd Merge pull request #121 from StevenRS11/1.6.2-code
1.6.2 code
2014-01-02 23:15:09 -08:00
StevenRS11 72bf14cc70 Merge pull request #120 from SenseiKiwi/master
Added Dungeon: The Nexus
2014-01-02 20:12:27 -08:00
StevenRS11 ed65a75e99 Merge pull request #119 from SenseiKiwi/mazes
Mazes
2013-12-30 16:07:52 -08:00
StevenRS11 180720c04b Merge pull request #116 from SenseiKiwi/master
Fixed Saving Log Spam
2013-12-25 23:33:09 -08:00
StevenRS11 399bb0ea9e Merge pull request #115 from SenseiKiwi/1.6-fixes
More Dungeons
2013-12-22 15:09:36 -08:00
StevenRS11 82a17a2981 Merge pull request #114 from SenseiKiwi/1.6-fixes
Overhauled Loot
2013-12-22 14:44:14 -08:00
StevenRS11 833e5d4e1c Merge pull request #112 from SenseiKiwi/rewrite
Fixed ClassCastException in DungeonPack
2013-12-20 00:01:21 -08:00
StevenRS11 51bd96dbe4 Merge pull request #111 from deathrat/1.6.2-code
1.6.2 code
2013-12-17 16:59:51 -08:00
StevenRS11 b83a766695 Merge pull request #110 from deathrat/1.6.2-code
Fixed problems with buildscript
2013-12-17 16:10:07 -08:00
StevenRS11 f28f071095 Merge pull request #109 from deathrat/1.6.2-code
Added Gradle Wrapper and set build path for jar
2013-12-17 00:52:57 -08:00
StevenRS11 31fc929170 Merge pull request #108 from deathrat/1.6.2-code
Support for ForgeGradle
2013-12-17 00:41:56 -08:00
StevenRS11 602b55111f one more time 2013-12-17 00:56:22 -06:00
StevenRS11 fd01d4e198 Fixing buildscript 2013-12-16 21:14:28 -06:00
StevenRS11 1931f7988c Merge pull request #107 from CannibalVox/master
Merging Canvox's patch
2013-12-16 18:58:44 -08:00
StevenRS11 7687a77332 Chunkloader fixes 2013-11-12 13:56:52 -05:00
StevenRS11 b818038fd6 Chunkloader fixes 2013-11-12 13:49:43 -05:00
StevenRS11 b18fe877de Fixed commands and rift orientation 2013-11-12 13:16:54 -05:00
StevenRS11 8fbb41a588 fixed commands and rift orientation 2013-11-12 13:08:05 -05:00
StevenRS11 a1628ff341 Fixed monoliths 2013-11-11 22:05:11 -05:00
StevenRS11 8dd1d85e6e Fixed chunkloaders and loading bug 2013-11-11 21:49:47 -05:00
StevenRS11 9b6aefa6ad Fixed assets 2013-11-11 21:42:40 -05:00
StevenRS11 9907ce1ce8 removed debug 2013-11-11 21:40:28 -05:00
StevenRS11 c48e2307c7 Fixed chunk loaders and dim loading bug 2013-11-11 21:39:11 -05:00
StevenRS11 c2bab6cc93 Build 2 2013-11-11 19:19:53 -05:00
StevenRS11 db9f422824 build stuff 2013-11-11 18:33:31 -05:00
StevenRS11 4486ef62fe Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-11-11 18:05:42 -05:00
StevenRS11 51f7e10834 Fixed more packet issues 2013-11-11 17:33:00 -05:00
StevenRS11 5cd5a323e0 Fixed Packet issues 2013-11-11 17:24:20 -05:00
StevenRS11 20ea00a0a7 Fixed packet issue 2013-11-11 16:36:35 -05:00
StevenRS11 841fcffcb1 fixes 2013-11-11 03:41:14 -05:00
StevenRS11 0f49c8c28f Small Fixes 2013-11-11 03:07:55 -05:00
StevenRS11 da608462d7 fixed monolith texture 2013-11-07 00:47:23 -05:00
StevenRS11 6b3b2d6471 Fixed Chunk Loading crash 2013-11-07 00:32:04 -05:00
StevenRS11 bb7cd95dcc Various fixes 2013-11-07 00:28:40 -05:00
StevenRS11 f2f1ee7af9 Finished Sounds 2013-11-06 22:46:55 -05:00
StevenRS11 4a6d166ba5 Finished Textures, starting sound 2013-11-06 22:16:56 -05:00
StevenRS11 51ee6d9c5e Finishing Textures 2013-11-06 19:30:39 -05:00
StevenRS11 bef91e2ce6 Merge pull request #93 from skyboy/master
Fix warnings and most texture things
2013-11-06 15:24:57 -08:00
StevenRS11 b4e0d53509 Not quite 2013-11-06 16:53:14 -05:00
StevenRS11 d849071e8e All non-texture changes made 2013-11-06 16:40:49 -05:00
StevenRS11 52fcfdaf49 Starting update to 1.6.2 2013-11-06 16:01:31 -05:00
StevenRS11 e4ee4a3cee crafting change 2013-11-06 15:46:43 -05:00
StevenRS11 a3b38a2c05 Merge pull request #92 from StevenRS11/master
Merging changes
2013-11-06 12:45:39 -08:00
StevenRS11 e271dd2fda Texture work 2013-11-06 15:43:26 -05:00
StevenRS11 59489f290f Finished Server mode
Also added World Thread
2013-11-06 15:16:07 -05:00
StevenRS11 e3df3cad08 Finished Loading blacklist & forced chunks 2013-11-06 14:27:55 -05:00
StevenRS11 d4fc43482d Fixed possible savedata import bug 2013-11-05 23:06:21 -05:00
StevenRS11 7d13c3afc0 more buildserver2 2013-11-05 21:27:37 -05:00
StevenRS11 a3a6c80fe5 More buildserver 2013-11-05 20:34:39 -05:00
StevenRS11 c39e2b34ab buildserver fixes
thanks deathrat!
2013-11-05 19:43:28 -05:00
StevenRS11 6383c4f5ff Merge remote-tracking branch 'origin/DevBranch' 2013-11-05 18:23:15 -05:00
StevenRS11 a04a266c17 THE UPDATE
Merging months of dev work into master. The update is playable, but
untested.
2013-11-05 18:15:23 -05:00
StevenRS11 df79aafd14 importing old savedata 2013-11-05 18:09:06 -05:00
StevenRS11 1bfc3f2eea Merged Devbranch into master 2013-11-05 13:49:45 -05:00
StevenRS11 a204cbd04e Implemented Loading and Saving 2013-11-05 13:44:24 -05:00
StevenRS11 a0224e8f14 Finished loading savedata 2013-11-05 13:38:16 -05:00
StevenRS11 5873d20f91 Finished Packing DungeonData 2013-11-05 03:34:15 -05:00
StevenRS11 58842048d4 Added dungeonData shell for saving 2013-11-05 02:36:12 -05:00
StevenRS11 69809df4c3 Added versioning to savedata 2013-11-05 00:36:38 -05:00
StevenRS11 b1503be63e Deserializing Savedata completed 2013-11-04 23:57:43 -05:00
StevenRS11 cbfb64622e optimizing door render code 2013-10-18 15:12:52 -04:00
StevenRS11 2f7b713f5e Added custom ambient music to limbo 2013-10-17 22:43:38 -04:00
StevenRS11 9418ed59df Started packing save data. At least it writes 2013-10-17 04:00:32 -04:00
StevenRS11 3376c1d772 Fixed network code
Everything seems to work fine now
2013-10-16 19:48:45 -04:00
StevenRS11 c08fa15f40 Working on server client 2013-10-16 17:17:46 -04:00
StevenRS11 2f98bf91e8 More work on rift remover
Reverted most changes back to SenseiKiwi's code, but fixed it not
raytracing.
2013-10-15 21:11:44 -04:00
StevenRS11 3e74f60807 Working on client/server madness 2013-10-15 20:37:27 -04:00
StevenRS11 be89913263 Merge pull request #90 from agaricusb/patch-1
Fix possible NPE in RiftRegenerator.regenerate()
2013-10-15 15:12:19 -07:00
StevenRS11 7a36e78769 small fixes
Fixed chunkloader bug
Fixed doors not tping non player entites because of orientation
2013-10-15 15:40:37 -04:00
StevenRS11 5bfd40f2b2 Temporary workaround for dungeon resetting 2013-10-09 23:42:55 -04:00
StevenRS11 b0c7c03fc6 Just was trying something 2013-10-09 19:18:36 -04:00
StevenRS11 9420b8edf2 Deleting dungeons is still buggy 2013-10-09 19:07:58 -04:00
StevenRS11 b9bd42a345 Fixed rift remover regression
still need to handle updating the other clients
2013-10-09 16:23:58 -04:00
StevenRS11 e421987338 Finished ResetCommand, first pass on blackList 2013-10-03 23:44:50 -04:00
StevenRS11 69864ea9ad Working on dungeon deletion 2013-10-02 00:52:18 -04:00
StevenRS11 eef5117c04 Readded commands
Also implemented dungeon regeneration
2013-10-01 22:50:43 -04:00
StevenRS11 d046bd88ea Tweaked how dungeons skip around
Dungeons send the player consistently in the direction they *face* now.
Allows for better travel using them, and also ensures that if they die,
they will be farther away.
2013-10-01 16:36:34 -04:00