Matthew
06a1a1927a
Merge branch 'develop' into chat_triggers
2018-11-27 13:39:05 -05:00
Matthew
b142939c5f
Overhaul config and global.scenario usage ( #466 )
2018-11-27 01:09:52 +01:00
Lynn
a3ff0edd61
Minor memory allocation fix
2018-11-26 20:31:10 +01:00
Lynn
58be972190
Fixed collapse on biters error
2018-11-26 20:23:53 +01:00
Lynn
ab1dff64f5
Cleanup Experience and MarketExchange to use the Retailer
2018-11-26 18:11:32 +01:00
Matthew
b5477034b7
Move infinite storage ( #463 )
2018-11-26 13:11:26 +01:00
Matthew
1332ad5a8d
Move spawn control ( #456 )
2018-11-26 13:10:37 +01:00
Matthew Heguy
de87998299
Break chat_trigger functions apart
2018-11-26 01:52:43 -05:00
SimonFlapse
fadce394c0
Made mining speed scale a bit quicker the first couple of levels
2018-11-25 15:00:23 +01:00
SimonFlapse
16f3241c98
Minor refactor to prevent turrets logic getting stuck
2018-11-25 13:45:14 +01:00
SimonFlapse
b240b278f6
Minor changes based on feedback
2018-11-25 12:53:05 +01:00
SimonFlapse
37c7b29221
Fixed broken turret and error messages in console
2018-11-25 05:14:08 +01:00
SimonFlapse
cae9c68c3e
Fixed multiplication instead of addition
...
Tested rocket launch succesfully
2018-11-25 02:45:21 +01:00
SimonFlapse
7b031a7c9d
Tweaking Diggy controls
...
Fixed rockets not giving experience and converted it to 1% of total experience.
Decreased player died deduct to 0.2%
Increased xp from rocks by 1 every fifth level
Increased xp from bots by about 1 every tenth level.
Increased early science XP reward (doubled for red and green, 50% for black and blue)
Level 100 is not 19,990,000 XP (Down from 30 million)
Starting XP is 400.
2018-11-25 02:27:41 +01:00
SimonFlapse
c78f023b50
Bot mining not giving xp fixed
2018-11-24 18:44:27 +01:00
SimonFlapse
a373cddade
Update AlienSpawner.lua
2018-11-24 18:08:18 +01:00
Lynn
dbc862a2a7
Properly pass debug and cheats
2018-11-24 17:55:08 +01:00
Lynn
7e3864ef19
Fixed undeflatable reference
2018-11-24 17:48:30 +01:00
Lynn
4d15ac038c
Some small performance fixes and cleanup
2018-11-24 17:31:34 +01:00
SimonFlapse
6ed752e73d
Fixed floating text and CI pleasing
2018-11-24 16:35:20 +01:00
SimonFlapse
7febb1162e
Turrets give experience
2018-11-24 16:33:26 +01:00
SimonFlapse
b1d182008e
Fixed exp scope
2018-11-24 16:08:14 +01:00
SimonFlapse
56a11c4ab7
Bot mining now gives about half experience
2018-11-24 16:05:01 +01:00
Lynn
1d876ed1ff
Fixed merge and cleanups
2018-11-24 13:53:06 +01:00
Lynn
83eee2b48a
Added bot mining and particles
2018-11-24 13:17:48 +01:00
Simon
22c21011ab
Diggy - New leveling system ( #402 )
...
* Basic setup for Force Control
* Buffs transitioned to new level system
Implemented level up buffs (Also made a double value avaliable at certain levels)
Added experience for research, rocket launched, mined rocks
Removing experience on player death. 0.5% of total experience
Added total_experience to ForceControl.lua
Refactored util/game.lua
* Transfered market item unlocks
Made Market Items unlock through the force control system.
Removed stone from mined stone
* Initial conversion of market items to coins
* Started biter killing giving XP
* XP for killing enemies. GUI update
* Made ForceControl.remove_experience return the actual removed experience
* Got my head and mind back, also fixed progress bar saying long numbers
* Changed get_market()
* Brand new formula, CI review changes
* Update CHANGELOG.md
2018-11-24 10:45:43 +01:00
Jayefuu
e2ea3a10df
Update tetris.lua ( #444 )
2018-11-24 10:37:08 +01:00
Matthew
55aaf19b48
Add player renaming ( #428 )
...
* Add player renaming from auto-generated names
* Give admins IDs on name changes
2018-11-23 18:08:44 +01:00
Matthew
a5d0ff0ae9
Merge pull request #424 from iltar/biter-mining-particles
...
Added particles when a biter mines a rock upon spawning
2018-11-22 22:53:50 -05:00
Matthew
9a62febdea
Merge pull request #433 from Jayefuu/map/tetris_and_world_thanksgiving
...
Add Tetris and World Thanksgiving maps
2018-11-22 22:22:03 -05:00
plague006
b85555bc00
Fix other lint warnings
2018-11-22 22:18:38 -05:00
plague006
b6c8f32c14
Merge and move docs
2018-11-22 17:44:27 -05:00
Jayefuu
0920ad70a5
Resolved Plague's comments
2018-11-22 22:11:00 +00:00
Lynn
b3a19a2a7b
Added bot mining
2018-11-22 20:43:23 +01:00
Jayefuu
5b727f5b53
Added:
...
- Tetris map and associated files
- World Thanksgiving map with turkey ore preset
2018-11-22 18:39:46 +00:00
Lynn
38068e15cd
Added particles when a biter mines a rock upon spawning
2018-11-21 21:09:46 +01:00
Lynn
a52e9f710c
Improved biter spawning algorithm ( #408 )
...
* Improved biter spawning algorithm
* HAIL HYDRA, biter hell
2018-11-21 15:26:04 +01:00
Matthew Heguy
e6dda20e41
All tabs to spaces
2018-11-21 08:42:39 -05:00
Matthew
8b74f104fc
Formatting ( #420 )
2018-11-21 14:35:47 +01:00
Matthew
691d47cbd0
Cleanup map_gen/shared ( #421 )
...
* Cleanup whitespaces+tabs
* Tabs to spaces
2018-11-21 14:34:19 +01:00
Matthew
c9369c3d14
Features cleanup ( #414 )
...
* Fix scoping, var names, unused functions, etc.
* Autoformat
2018-11-20 11:46:19 +01:00
Lynn
bb05785c79
added cause and force to the entity died
2018-11-18 19:21:39 +01:00
Lynn
7b51db1ac0
Prevent rocks from dying and spilling on dmg taken
2018-11-18 19:15:45 +01:00
Valansch
7fa48bc583
Changed all windows style line endings to unix style line endings ( #393 )
2018-11-18 17:12:00 +01:00
Simon
bdfd122f3c
Changed first popup from full inventory to ping ( #392 )
2018-11-18 17:06:23 +01:00
Lynn
74fa8009fa
Mining related improvements ( #391 )
...
* Fixed manual mining overflow hints
* Smaller memory footprint for collapse message
2018-11-18 16:48:28 +01:00
Lynn
3ac668c731
Merge pull request #390 from SimonFlapse/Diggy-Market-Text
...
Changed the level up chat messages for diggy
2018-11-18 16:42:17 +01:00
SimonFlapse
cb0daa31bf
Changed Debug to Diggy specific debug.print()
2018-11-18 16:40:37 +01:00
SimonFlapse
e399370292
Less prints at level up
2018-11-18 16:25:56 +01:00
Lynn
988713d258
Fixed room loot spill (close to permanently) ( #388 )
2018-11-18 16:23:25 +01:00
