 Cat Flynn
|
955972e4a3
|
Merge branch 'main' into feature/dialogue-frontend
|
2021-02-22 10:33:36 +00:00 |
|
Cat Flynn
|
dace2961ee
|
Merge branch 'artefacts_list' into 'main'
Added Artefacts - Artefact Inventory (tracking system)
See merge request kernel-panic/revival!8
|
2021-02-22 09:07:46 +00:00 |
|
Cat Flynn
|
1fe3bbd79d
|
Merge branch 'main' into artefacts_list
|
2021-02-22 09:01:33 +00:00 |
Novvator
|
f5cc5a4f14
|
Added nearbyArtefactID SerialInt
|
2021-02-19 20:38:45 +00:00 |
|
Cat Flynn
|
5d79c1b637
|
begin dialogue frontend implementation, placeholder dialogue ui
|
2021-02-19 16:33:02 +00:00 |
|
Cat Flynn
|
ddce06585f
|
use custom .data instead of raw csv file in dialogue db
|
2021-02-19 16:26:15 +00:00 |
|
Novvator
|
4397ec0326
|
Changed Artefact and ArtefactInventory to Scriptable objects
Added artefact prefab
|
2021-02-19 15:14:14 +00:00 |
|
Cat Flynn
|
f1c9f8a752
|
fix error spam in edit mode
|
2021-02-18 17:24:15 +00:00 |
|
Cat Flynn
|
28b8b860d1
|
make log readable
|
2021-02-15 23:26:42 +00:00 |
|
Cat Flynn
|
9eea5cd4d5
|
add log that should have been there in the first place
|
2021-02-15 23:11:29 +00:00 |
|
Cat Flynn
|
4013f6ef0c
|
Merge branch 'feature/character-controller' into 'main'
Feature/character controller
See merge request kernel-panic/revival!4
|
2021-02-15 18:09:32 +00:00 |
 Cinder Foster-Smith
|
96860632ff
|
Feature/character controller
|
2021-02-15 18:09:32 +00:00 |
|
Cinder Foster-Smith
|
8388f7fd3e
|
Merge branch 'fix/early-ci-timeout' into 'main'
Fix/early ci timeout
See merge request kernel-panic/revival!6
|
2021-02-15 17:12:44 +00:00 |
|
Cat Flynn
|
6717be82f9
|
Fix/early ci timeout
|
2021-02-15 17:12:44 +00:00 |
|
Cat Flynn
|
baefee4a00
|
Merge branch 'feature/import-dialogue' into 'main'
Feature/import dialogue
See merge request kernel-panic/revival!5
|
2021-02-15 13:42:14 +00:00 |
|
Cat Flynn
|
4e76ea2168
|
Feature/import dialogue
|
2021-02-15 13:42:14 +00:00 |
|
Novvator
|
7ff4569fde
|
Added Artefacts - Artefact Inventory (tracking system)
|
2021-02-14 15:08:59 +00:00 |
|
Cat Flynn
|
0642edc772
|
Merge branch 'feature/flow' into 'main'
Game Flow
See merge request kernel-panic/revival!3
|
2021-02-12 14:18:50 +00:00 |
|
cyndrdev
|
7a25b61f90
|
fixed ci issue
|
2021-02-12 14:12:26 +00:00 |
|
cyndrdev
|
95f04ad618
|
Merge branch 'feature/flow' of https://gitlab.badbrain.dev/kernel-panic/game into feature/flow
|
2021-02-12 14:05:16 +00:00 |
|
cyndrdev
|
7c769a2371
|
changes from code review
|
2021-02-12 14:04:12 +00:00 |
|
Cat Flynn
|
4424659082
|
Merge branch 'main' into feature/flow
|
2021-02-12 10:36:41 +00:00 |
|
cyndrdev
|
d62f3a7b6b
|
debug text visibility
|
2021-02-12 09:35:59 +00:00 |
|
cyndrdev
|
a4906a35d4
|
gameflow
|
2021-02-12 09:32:10 +00:00 |
|
Cat Flynn
|
c30ad79cfd
|
Merge branch 'Feature/BlockOut' into 'main'
Created small block out of the level for the programmers to test the mechanics
See merge request kernel-panic/revival!2
|
2021-02-09 16:02:24 +00:00 |
CharlieTinley
|
e790ef7493
|
Created small block out of the level for the programmers to test the mechanics
|
2021-02-09 15:48:42 +00:00 |
|
Cat Flynn
|
d9eba6d5d1
|
rename branches
|
2021-02-01 21:31:40 +00:00 |
|
Cat Flynn
|
5bfa479231
|
actually release instead of just saying so
|
2021-02-01 21:03:22 +00:00 |
|
Cat Flynn
|
51a2c3f753
|
release everything on prod branch
|
2021-02-01 20:25:55 +00:00 |
|
Cat Flynn
|
36da8d1ff9
|
require release version for prod
|
2021-02-01 20:24:11 +00:00 |
|
Cat Flynn
|
59deae9376
|
typo
|
2021-02-01 20:15:31 +00:00 |
|
Cat Flynn
|
17c236831e
|
only deploy to prod for manual pipelines
|
2021-02-01 20:13:24 +00:00 |
|
Cat Flynn
|
d682861585
|
always clean up after build job
|
2021-02-01 19:54:39 +00:00 |
|
Cat Flynn
|
df29b463a2
|
typo
|
2021-02-01 19:37:37 +00:00 |
|
Cat Flynn
|
c8b029fe7e
|
wait for editor log to exist
|
2021-02-01 19:36:39 +00:00 |
|
Cat Flynn
|
e681a3f306
|
properly tail log and check build result
|
2021-02-01 18:00:00 +00:00 |
|
Cat Flynn
|
b5e904c835
|
add cleanup job to clear build directory
|
2021-02-01 14:06:31 +00:00 |
|
Cat Flynn
|
bad0b70319
|
fix typo in ci variable
|
2021-02-01 13:32:30 +00:00 |
|
Cat Flynn
|
90d1944d6e
|
instance and clean up build job
|
2021-02-01 13:30:56 +00:00 |
|
Cat Flynn
|
2b0b48663a
|
remove unity kill check, instance pipeline
|
2021-02-01 11:20:34 +00:00 |
|
Cat Flynn
|
cb9c1a20f1
|
add tags to jobs
|
2021-01-30 15:35:58 +00:00 |
|
Cat Flynn
|
7f7bc2123c
|
wait for unity processes to die
|
2021-01-30 15:19:19 +00:00 |
|
Cat Flynn
|
a160eddf59
|
fix line endings
|
2021-01-30 14:18:47 +00:00 |
|
Cat Flynn
|
6290dde9db
|
kill existing unity processes before attempting build
|
2021-01-30 14:16:26 +00:00 |
|
Cat Flynn
|
d28a2b22c5
|
validated ci config
|
2021-01-29 18:46:49 +00:00 |
|
Cat Flynn
|
a155d0e414
|
typo
|
2021-01-29 18:43:23 +00:00 |
|
Cat Flynn
|
4516d304c6
|
add deploy job base
|
2021-01-29 18:38:39 +00:00 |
|
Cat Flynn
|
53a011447a
|
remove leading periods
|
2021-01-29 18:36:11 +00:00 |
|
Cat Flynn
|
80e4b35795
|
another go at naming deploy jobs
|
2021-01-29 18:35:08 +00:00 |
|
Cat Flynn
|
0ca78c06d4
|
rename deploy jobs
|
2021-01-29 18:32:36 +00:00 |