Aidan C. Brady
|
d63628bebc
|
Merge branch 'master' into development
Conflicts:
common/mekanism/client/ClientProxy.java
common/mekanism/client/HolidayManager.java
common/mekanism/client/sound/SoundHandler.java
common/mekanism/client/sound/TileSound.java
|
2013-12-24 14:44:17 -05:00 |
|
|
Aidan Brady
|
84f4eaee76
|
Christmas fun :)
|
2013-12-24 14:38:12 -05:00 |
|
|
Aidan Brady
|
fd26b9b11b
|
Work on a little Christmas surprise
|
2013-12-24 13:25:31 -05:00 |
|
|
Aidan Brady
|
87ce53f3fe
|
Removed more UE stuff
|
2013-12-22 01:04:35 -05:00 |
|
|
Aidan C. Brady
|
0ab803feeb
|
Rename Object3D to Coord4D, work on balloons
|
2013-12-20 16:09:09 -05:00 |
|
|
Aidan Brady
|
4125ef57c6
|
minor changes
|
2013-12-08 21:40:00 -05:00 |
|
|
Aidan Brady
|
0d830d6136
|
Attempt a few jetpack fixes
|
2013-12-08 20:35:45 -05:00 |
|
|
Aidan C. Brady
|
ce629e218c
|
Fix IC2 charging
|
2013-12-08 16:10:52 -05:00 |
|
|
Aidan C. Brady
|
8289af18fd
|
Add configurable sound volume for all Mekanism sounds
|
2013-12-08 12:49:48 -05:00 |
|
|
Aidan Brady
|
62bc5c267a
|
Fixed weird jetpack particles
|
2013-12-07 23:51:07 -05:00 |
|
|
Aidan Brady
|
c2737ff064
|
Work on things, may be unstable
|
2013-12-07 17:06:11 -05:00 |
|
|
Aidan C. Brady
|
cb9900bbc7
|
Work on gas masks/scuba gear stuff
|
2013-12-06 15:26:44 -05:00 |
|
|
Aidan Brady
|
aca0692cec
|
Fix a few jetpack things
|
2013-12-04 17:22:00 -05:00 |
|
|
Aidan Brady
|
bf9d48d86f
|
Work on jetpacks - specifically networking fixes and sounds!
|
2013-12-04 16:53:58 -05:00 |
|
|
Aidan Brady
|
5d949ec959
|
Fixed API for @micdoodle8
|
2013-11-30 23:19:24 -05:00 |
|
|
Aidan Brady
|
b224a01f39
|
Work on localization support, move around some API classes to make better compatibility
|
2013-11-30 00:28:02 -05:00 |
|
|
Aidan Brady
|
a63a8902f2
|
Sounds should be fixed.
|
2013-11-17 19:25:52 -05:00 |
|
|
Aidan Brady
|
f988c54134
|
Hopefully the final fix
|
2013-11-17 19:16:40 -05:00 |
|
|
Aidan Brady
|
147fb7609d
|
Try removing extra url junk
|
2013-11-17 19:07:18 -05:00 |
|
|
Aidan Brady
|
40dd6798ea
|
Attempted sound fixes
Guaranteed not to work :)
|
2013-11-17 19:03:44 -05:00 |
|
|
Aidan Brady
|
6a4750f90b
|
Hopefully fixed sounds…
|
2013-11-17 13:39:40 -05:00 |
|
|
Aidan Brady
|
8095eb206c
|
Fix textures, hopefully fix sounds
|
2013-11-17 13:31:56 -05:00 |
|
|
Aidan Brady
|
8a79352563
|
Debugging sound system
|
2013-11-17 13:23:19 -05:00 |
|
|
Aidan C. Brady
|
c9b5c7b51f
|
Some work on rendering, fixed sound error
|
2013-11-13 14:59:11 -05:00 |
|
|
Aidan Brady
|
1ff600b4a9
|
Added configurable restrictive input colors to all configurable machines, added some dandy sound effects
|
2013-11-04 21:11:09 -05:00 |
|
|
Aidan Brady
|
d1a1e3375a
|
New Metallurgic Infuser model, more efficient active state management
|
2013-11-02 19:06:56 -04:00 |
|
|
Aidan Brady
|
799142198a
|
Fixed ridiculous client updates when GUI is open, fancy active sorter rendering, sorter eject sound effect :)
|
2013-11-01 23:51:10 -04:00 |
|
|
Aidan C. Brady
|
f0b6799409
|
Machines eject into transporters.
|
2013-10-31 14:46:14 -04:00 |
|
|
Aidan C. Brady
|
a00a557f2b
|
Preload sounds on game startup, immediately fire updateScreen() on OreDict filter calculation, added restriction transporter recipe
|
2013-10-31 14:26:04 -04:00 |
|
|
Aidan C. Brady
|
1b717267f3
|
Moved client-sensitive info over to MekanismClient
|
2013-10-14 23:36:07 -04:00 |
|
|
Aidan C. Brady
|
86b8499bb5
|
A bit more organizing, nothing API related
|
2013-08-26 18:57:08 -04:00 |
|