Commit Graph

79 Commits (ab18ba19bfdd853596e10f1442de39c5495e4d3f)

Author SHA1 Message Date
Jessica Hawkwell db5c689a08 fixing the ordering in gitignore, some minor changes
Corrected the ordering of stuffies in gitignore and did some small(ish)
changes in a few other files.
2016-03-23 16:38:41 -04:00
Rasmus Praestholm 6b54120624 More doc stuff! Including new GitHub template files. 2016-03-01 00:24:03 -05:00
Rasmus Praestholm 54b2e06038 Tweaks to let BuilderSampleGameplay work as a typical embedded module. 2016-02-22 00:18:07 -05:00
Rasmus Praestholm 52ba3e2706 Ignore TeraEd.iml 2016-01-01 17:51:46 -05:00
Rasmus Praestholm c1a1996a84 Adjust the metrics config with proper cleanup and pathing that won't cause inaccurate "UP-TO-DATE" issues. 2015-12-26 16:55:39 -05:00
Martin Steiger e0eaa8114b Move TeraEd to new facade project 2015-10-31 10:52:25 +01:00
Rasmus Praestholm b59211a208 Proof of concept: Extracting retrieved zip directly into config dir (then .gitignoring it) 2015-04-22 23:18:07 -04:00
Rasmus Praestholm ccd39be598 Tweak .gitignore and template gradle.properties 2015-04-21 00:38:47 -04:00
Josh Zacharias e31a56a2e7 Separate the starting inventory from the Core content by adding a Core Sample Gameplay module. 2015-02-12 14:10:38 -08:00
Rasmus Praestholm fbe1e51160 Gradle/Artifactory checkpoint - "It works on my machine!" worthy, needs more tweaking and testing 2014-11-09 15:38:23 -05:00
Rasmus Praestholm b7c0731c22 Add a run config for IntelliJ that launches another instance of the game into its own terasology-2ndclient data dir, good for multiplayer testing 2014-10-02 23:42:31 -04:00
Rasmus Praestholm 59af07b527 Add support for "meta modules" - intended to be GitHub repos to store game related assets that we do not use directly in-game (Blender models, high quality music, etc). This way they can be worked as part of a multi-project workspace like everything else. 2014-04-27 01:53:57 -04:00
Rasmus Praestholm 01f590cddf Add a Gradle task to run a local headless server, with data stored in [project-root]/terasology-server so you can run from IDE or via a second command window without data clashing (no relation to end-users running a server - just a convenience for devs) 2014-02-06 23:07:12 -05:00
Immortius 1239f687ec Attempted fix for ignoring OSX Icon\r files. 2014-01-28 08:41:05 +11:00
Cervator 0b34402d8b Move where the Eclipse launcher file generates to and properly Git-ignore it 2013-12-28 16:50:21 -05:00
Cervator b3ffceeead Merge #755 by @msteiger - Eclipse tweaks
Conflicts:
 facades/PC/build.gradle - minor
 unit test classes - moved to new engine-tests sub-project
2013-12-26 12:59:33 -05:00
Cervator 06e725af02 Another pile of structural changes mostly related to unit testing
- Moves the engine unit tests to its own sub-project
- Assorted Gradle cleanup
- More debug logging for troubleshooting working directory vs. location of natives (still problematic in several scenarios)
- Some initial prep for better Eclipse support (the unit test move in particular helps avoid weird dependencies)
2013-12-25 23:07:59 -05:00
Martin Steiger 82808151f4 Merge branch 'develop' of github.com:MovingBlocks/Terasology into mbts_dev
Conflicts:
	.gitignore
	engine/src/main/java/org/terasology/config/BindsConfig.java

Merged using --theirs
2013-12-14 21:35:32 +01:00
Martin Steiger 957d294835 Update gitignore for checkstyle config 2013-11-25 21:19:50 +01:00
Rasmus Praestholm 24015cdc13 Tweak comment for #754 2013-11-20 00:55:18 -05:00
Martin Steiger 4ec090d0a9 Updated .gitignore to deal with eclipse project files 2013-11-19 19:21:48 +01:00
Rasmus Praestholm e596b1cf9a Forgot ignoring the engine.iml 2013-10-19 18:33:26 -04:00
Rasmus Praestholm 9f8a236597 Make the build.gradle under Core the template for modules and tweak .gitignore real quick for full support for older versions of Git 2013-10-19 18:29:38 -04:00
Rasmus Praestholm 8e1a024bd4 Restructure: Put all the changed Gradle stuff in place (any needed code tweaks not done yet) 2013-10-17 00:55:34 -04:00
Marcos Vives Del Sol 84cf0ee9ef Add .gitattributes 2013-10-15 17:32:57 +02:00
Immortius e6b8d917b7 Updated build.gradle in line with develop
Updated README.markdown in line with develop
Changed mod.txt generation to use a template
Changed applet/index.html to be a template, which is now populated with the correct jars and mods and lwjgl version
Fixed the dependency on slick to ignore transitive lwjgl dependencies
2013-07-20 14:21:51 +10:00
Immortius a714d0f7f7 Updated .gitignore inline with develop. 2013-07-19 14:22:24 +10:00
Immortius 39f812ca42 Game time is now persisted
Bit of refactoring of the save game format in preparation for multiple world support.
Removed some old classes that were unused.
2013-06-28 15:23:11 +10:00
Immortius bbab6e3c5a Some improvements to TerasologyTestingEnvironment
Moved EntitySystem benchmarks into benchmark code.
2013-05-25 10:00:57 +10:00
Immortius 807de6aa33 Updated protobuf and netty.
Partially implemented client identity and authentication.
A server certificate is generated for the user on first run of Terasology.
When a client joins a server for the first time, they are provided an identity for use on that server.
Disabled compression temporarily (need to work out a bug causing some data to be lost)
2013-05-11 19:16:36 +10:00
Immortius 52f18b1421 Completed move of configuration over to the new (JSON) system. 2013-03-02 16:53:49 +11:00
Immortius b093d2ead5 Merge branch 'develop' of git@github.com:MovingBlocks/Terasology.git into multiplayer
Conflicts:
	mods/core/assets/prefabs/player.prefab
	src/main/java/org/terasology/asset/sources/AbstractSource.java
	src/main/java/org/terasology/componentSystem/rendering/FirstPersonRenderer.java
	src/main/java/org/terasology/config/Config.java
	src/main/java/org/terasology/entitySystem/pojo/PojoEntityManager.java
	src/main/java/org/terasology/game/types/FreeStyleType.java
	src/main/java/org/terasology/logic/commands/Commands.java
	src/main/java/org/terasology/logic/players/LocalPlayer.java
	src/main/java/org/terasology/logic/players/LocalPlayerSystem.java
	src/main/java/org/terasology/rendering/gui/widgets/UIItemContainer.java
	src/main/java/org/terasology/rendering/gui/windows/UIScreenItems.java
	src/main/java/org/terasology/rendering/logic/MeshRenderer.java
	src/main/java/org/terasology/rendering/world/WorldRenderer.java
	src/main/java/org/terasology/world/chunks/Chunk.java
	src/main/java/org/terasology/world/chunks/localChunkProvider/LocalChunkProvider.java
2013-01-25 10:38:49 +11:00
esa-petri a519ef74ee Hunger and consumables 2013-01-14 17:02:56 +02:00
Immortius 2ab585fb25 Numerous fixes to event and entity replication.
Removed inital chat code and replaced with an event based system.
Added a client info prefab, for player information replicated to all players.
Fixed dumpEntities command to dump all entities even if they are not set to be persisted.
Added a "local" client indicator to ClientComponent.
Fixed initialisation order on client so that prefabs are registered before received entities are processed.
Removed irrelevent scoping from message manager.
2013-01-06 16:17:28 +11:00
Immortius c6eb32676a Prepared build file and mod structure for code mods. 2012-10-01 11:00:11 +10:00
Mathias Kalb fe853faa62 Correct ".gitignore" 2012-08-31 10:49:45 +02:00
Mathias Kalb 6c3cd0dea1 TerasologyDevelopment and correct gitignore 2012-08-31 10:25:49 +02:00
Mathias Kalb cf886fe609 Checkstyle: Fix for Eclipse plugin 2012-08-29 22:24:16 +02:00
Mathias Kalb 17d268787f First version of the reworked build-file 2012-08-01 17:53:35 +02:00
Ian Macalinao a043b34223 Invert scroll wheel. Fixes GH-282. 2012-07-27 13:51:36 -05:00
Benjamin Glatzel 3f5645d4f4 Adds many rendering related changes.
* Adds new tone mapping operators
* Sets the default tone mapping operator to the Uncharted 2 filmic operator and adjusts all related systems accordingly
* Sets the normals of billboards to point up
* Changes the fog function to be exp^2 and adjusts all other parts accordingly
* Fixes and adjusts flickering block- and torchlight
* Adds a new separate function for flickering torchlight
* Fixes lit blocks being overly dark at night
* Fixes that the water surface was not rendered correctly while swimming
* Changes the way the fog value is calculated (should be varying much more now)
* Fixes FoV animation not being clamped correctly
* Removes orphaned function from ChunkTessellator
2012-06-24 14:00:54 +02:00
Rasmus Praestholm fbdacf936d Complete pull request #253 by temsa for tweaking new AZERTY keys
Conflicts:
	.gitignore - benign addition on each side
2012-06-11 21:08:41 -04:00
Benjamin Glatzel 6375541416 * Changes the tinting of grass blocks by desaturating the textures
* Drastically increases the resolution of the clouds and adjusts the noise function accordingly
* Adds the functionality to hide the HUD to the 'H' key
* Adds new background images for the menu and loading screen
* Adds new image path to the README
* Adds consolelog.json to .gitignore file and removes it from the repository
2012-06-12 00:36:11 +02:00
Florian Traverse 7942482a0d added a gitignore for backup files (ending with ~) 2012-06-09 08:51:33 +02:00
Immortius dca419194c Moved most input handling to use the new system, minion system remains. 2012-06-07 22:10:51 +10:00
Immortius 7ceee8987e Fixed some bugs introduced by the removal of braces from nested ifs
Some fixes to bring code in line with code standard
2012-06-03 23:21:27 +10:00
Austin Richards 6a302a786e Rebased to MovingBlocks develop branch. 2012-05-24 23:19:49 -04:00
Immortius f99f0dbd84 Initial wave of project restructure
* Adopted maven-style directory structure
* Moved performance tests into their own sourceSet (run with perfTest task)
* Split resources and groovy into separate source paths
* Changed compatibility level to 1.6
* Changed output to use the target folder
* Excluded some folders from the IDEA project to keep things neat
* Run is now executed on the produced jar to solve classpath issues, pending improved resource resolution
2012-04-14 20:51:59 +10:00
Rich Apodaca c4b349f5eb Add IntilliJ files to gitignore 2012-02-29 21:16:22 -08:00
Rich Apodaca 0aafe1e2d6 Resove merge conflicts 2012-02-27 22:09:30 -08:00